diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:32:43 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:32:43 +0000 |
| commit | d7de57877613a63e36facbd485245918c1131f61 (patch) | |
| tree | 164f1422c744e42edd84bb92fe347024ab71ec3c /chrome/service/service_main.cc | |
| parent | 5179b9146ce7029e1daedf8607d2bfae50764e7b (diff) | |
| download | chromium_src-d7de57877613a63e36facbd485245918c1131f61.zip chromium_src-d7de57877613a63e36facbd485245918c1131f61.tar.gz chromium_src-d7de57877613a63e36facbd485245918c1131f61.tar.bz2 | |
[Mac] Remove content/ CrApplication.
Pull the CrAppProtocol autorelease-pool handling down into
MessagePumpCrApplication, which is selected at Create() if NSApp
implements the right protocol. UsingCrApp() allows clients to
confirm the correct setup (unfortunately, synchronizing NSApp
initialization and MessagePump::Create() would be intrusive).
Also push CrAppProtocol and CrAppControlProtocol implementation into
BrowserCrApplication, and reparent that class from NSApplication.
Reparent ServiceCrApplication on NSApplication and rename.
Remove CrApplication registration from gpu, plugin, and renderer
mains.
Remove MockCrApp dependency from remoting sample code.
BUG=102224
Review URL: http://codereview.chromium.org/8771028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service/service_main.cc')
| -rw-r--r-- | chrome/service/service_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc index 99d6c83..bcde1ba 100644 --- a/chrome/service/service_main.cc +++ b/chrome/service/service_main.cc @@ -18,6 +18,10 @@ // Mainline routine for running as the service process. int ServiceProcessMain(const content::MainFunctionParams& parameters) { +#if defined(OS_MACOSX) + chrome_service_application_mac::RegisterServiceApp(); +#endif + MessageLoopForUI main_message_loop; main_message_loop.set_thread_name("MainThread"); if (parameters.command_line.HasSwitch(switches::kWaitForDebugger)) { @@ -27,10 +31,6 @@ int ServiceProcessMain(const content::MainFunctionParams& parameters) { VLOG(1) << "Service process launched: " << parameters.command_line.GetCommandLineString(); -#if defined(OS_MACOSX) - chrome_service_application_mac::RegisterServiceCrApp(); -#endif - base::PlatformThread::SetName("CrServiceMain"); // If there is already a service process running, quit now. |