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

Unified Diff: chrome/service/service_main.cc

Issue 8771028: [Mac] Remove content/ CrApplication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk for commit-queue. Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/service/chrome_service_application_mac.mm ('k') | content/common/chrome_application_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/service_main.cc
diff --git a/chrome/service/service_main.cc b/chrome/service/service_main.cc
index 99d6c83f349d58095dac5b05e392376f57b49743..bcde1badbfa05116ad3ca97ddfd37b6e35cb7c9d 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.
« no previous file with comments | « chrome/service/chrome_service_application_mac.mm ('k') | content/common/chrome_application_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698