Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Side by Side Diff: content/plugin/plugin_main.cc

Issue 8387039: Move content_restriction.h and main_function_params.h to content/public/common, and put them in t... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 | « content/gpu/gpu_main.cc ('k') | content/ppapi_plugin/ppapi_broker_main.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 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <objbase.h> 8 #include <objbase.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
11 11
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/system_monitor/system_monitor.h" 15 #include "base/system_monitor/system_monitor.h"
16 #include "base/threading/platform_thread.h" 16 #include "base/threading/platform_thread.h"
17 #include "content/common/child_process.h" 17 #include "content/common/child_process.h"
18 #include "content/common/hi_res_timer_manager.h" 18 #include "content/common/hi_res_timer_manager.h"
19 #include "content/common/main_function_params.h"
20 #include "content/plugin/plugin_thread.h" 19 #include "content/plugin/plugin_thread.h"
21 #include "content/public/common/content_switches.h" 20 #include "content/public/common/content_switches.h"
21 #include "content/public/common/main_function_params.h"
22 22
23 #if defined(OS_WIN) 23 #if defined(OS_WIN)
24 #include "content/common/injection_test_dll.h" 24 #include "content/common/injection_test_dll.h"
25 #include "sandbox/src/sandbox.h" 25 #include "sandbox/src/sandbox.h"
26 #elif defined(OS_POSIX) && !defined(OS_MACOSX) 26 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
27 #include "base/global_descriptors_posix.h" 27 #include "base/global_descriptors_posix.h"
28 #include "ipc/ipc_descriptors.h" 28 #include "ipc/ipc_descriptors.h"
29 #endif 29 #endif
30 30
31 #if defined(OS_MACOSX) 31 #if defined(OS_MACOSX)
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 if (!imc) 68 if (!imc)
69 return 0; 69 return 0;
70 if (::ImmGetOpenStatus(imc)) 70 if (::ImmGetOpenStatus(imc))
71 return 1; 71 return 1;
72 return 2; 72 return 2;
73 } 73 }
74 74
75 #endif 75 #endif
76 76
77 // main() routine for running as the plugin process. 77 // main() routine for running as the plugin process.
78 int PluginMain(const MainFunctionParams& parameters) { 78 int PluginMain(const content::MainFunctionParams& parameters) {
79 // The main thread of the plugin services UI. 79 // The main thread of the plugin services UI.
80 #if defined(OS_MACOSX) 80 #if defined(OS_MACOSX)
81 #if !defined(__LP64__) 81 #if !defined(__LP64__)
82 TrimInterposeEnvironment(); 82 TrimInterposeEnvironment();
83 #endif 83 #endif
84 InitializeChromeApplication(); 84 InitializeChromeApplication();
85 #endif 85 #endif
86 MessageLoop main_message_loop(MessageLoop::TYPE_UI); 86 MessageLoop main_message_loop(MessageLoop::TYPE_UI);
87 base::PlatformThread::SetName("CrPluginMain"); 87 base::PlatformThread::SetName("CrPluginMain");
88 88
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 MessageLoop::current()->Run(); 163 MessageLoop::current()->Run();
164 } 164 }
165 165
166 #if defined(OS_WIN) 166 #if defined(OS_WIN)
167 CoUninitialize(); 167 CoUninitialize();
168 #endif 168 #endif
169 169
170 return 0; 170 return 0;
171 } 171 }
OLDNEW
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/ppapi_plugin/ppapi_broker_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698