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

Side by Side Diff: content/ppapi_plugin/ppapi_plugin_main.cc

Issue 8277018: Move content_switches to content\public\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « content/ppapi_plugin/ppapi_broker_main.cc ('k') | content/ppapi_plugin/ppapi_thread.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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/debug/debugger.h" 6 #include "base/debug/debugger.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/common/child_process.h" 10 #include "content/common/child_process.h"
11 #include "content/common/content_switches.h"
12 #include "content/common/main_function_params.h" 11 #include "content/common/main_function_params.h"
13 #include "content/ppapi_plugin/ppapi_thread.h" 12 #include "content/ppapi_plugin/ppapi_thread.h"
13 #include "content/public/common/content_switches.h"
14 #include "ppapi/proxy/proxy_module.h" 14 #include "ppapi/proxy/proxy_module.h"
15 15
16 #if defined(OS_WIN) 16 #if defined(OS_WIN)
17 #include "sandbox/src/sandbox.h" 17 #include "sandbox/src/sandbox.h"
18 #endif 18 #endif
19 19
20 #if defined(OS_MACOSX) 20 #if defined(OS_MACOSX)
21 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface .h" 21 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface .h"
22 #endif 22 #endif
23 23
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 ChildProcess ppapi_process; 57 ChildProcess ppapi_process;
58 ppapi_process.set_main_thread(new PpapiThread(false)); // Not a broker. 58 ppapi_process.set_main_thread(new PpapiThread(false)); // Not a broker.
59 59
60 ppapi::proxy::ProxyModule::GetInstance()->SetFlashCommandLineArgs( 60 ppapi::proxy::ProxyModule::GetInstance()->SetFlashCommandLineArgs(
61 command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs)); 61 command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
62 62
63 main_message_loop.Run(); 63 main_message_loop.Run();
64 return 0; 64 return 0;
65 } 65 }
OLDNEW
« no previous file with comments | « content/ppapi_plugin/ppapi_broker_main.cc ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698