Chromium Code Reviews
[email protected] (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: chrome/renderer/renderer_main.cc

Issue 6869051: Move PepperPluginRegistry to content, while leaving the Chrome specific bits (NaCl, registration ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/pepper_plugin_registry.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if defined(OS_MACOSX) 5 #if defined(OS_MACOSX)
6 #include <signal.h> 6 #include <signal.h>
7 #include <unistd.h> 7 #include <unistd.h>
8 #endif // OS_MACOSX 8 #endif // OS_MACOSX
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/mac/scoped_nsautorelease_pool.h" 13 #include "base/mac/scoped_nsautorelease_pool.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/metrics/field_trial.h" 15 #include "base/metrics/field_trial.h"
16 #include "base/message_loop.h" 16 #include "base/message_loop.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/metrics/stats_counters.h" 18 #include "base/metrics/stats_counters.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/process_util.h" 20 #include "base/process_util.h"
21 #include "base/string_util.h" 21 #include "base/string_util.h"
22 #include "base/threading/platform_thread.h" 22 #include "base/threading/platform_thread.h"
23 #include "base/time.h" 23 #include "base/time.h"
24 #include "chrome/common/chrome_constants.h" 24 #include "chrome/common/chrome_constants.h"
25 #include "chrome/common/chrome_counters.h" 25 #include "chrome/common/chrome_counters.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/logging_chrome.h" 27 #include "chrome/common/logging_chrome.h"
28 #include "chrome/common/net/net_resource_provider.h" 28 #include "chrome/common/net/net_resource_provider.h"
29 #include "chrome/common/pepper_plugin_registry.h"
30 #include "chrome/renderer/renderer_main_platform_delegate.h" 29 #include "chrome/renderer/renderer_main_platform_delegate.h"
31 #include "content/common/main_function_params.h" 30 #include "content/common/main_function_params.h"
32 #include "content/common/hi_res_timer_manager.h" 31 #include "content/common/hi_res_timer_manager.h"
32 #include "content/common/pepper_plugin_registry.h"
33 #include "content/renderer/render_process_impl.h" 33 #include "content/renderer/render_process_impl.h"
34 #include "content/renderer/render_thread.h" 34 #include "content/renderer/render_thread.h"
35 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
36 #include "net/base/net_module.h" 36 #include "net/base/net_module.h"
37 #include "ui/base/system_monitor/system_monitor.h" 37 #include "ui/base/system_monitor/system_monitor.h"
38 #include "ui/base/ui_base_switches.h" 38 #include "ui/base/ui_base_switches.h"
39 39
40 #if defined(OS_MACOSX) 40 #if defined(OS_MACOSX)
41 #include <Carbon/Carbon.h> // TISCreateInputSourceList 41 #include <Carbon/Carbon.h> // TISCreateInputSourceList
42 42
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 pool->Recycle(); 363 pool->Recycle();
364 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0); 364 TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0);
365 MessageLoop::current()->Run(); 365 MessageLoop::current()->Run();
366 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0); 366 TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0);
367 } 367 }
368 } 368 }
369 platform.PlatformUninitialize(); 369 platform.PlatformUninitialize();
370 TRACE_EVENT_END("RendererMain", 0, ""); 370 TRACE_EVENT_END("RendererMain", 0, "");
371 return 0; 371 return 0;
372 } 372 }
OLDNEW
« no previous file with comments | « chrome/common/pepper_plugin_registry.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698