Set up desktop in proper location; fix notification initialization.

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 182 matching lines @@
 
 #if defined(TOUCH_UI)
 #include "ui/base/touch/touch_factory.h"
 #endif
 
 #if defined(USE_X11)
 #include "chrome/browser/chrome_browser_main_x11.h"
 #endif
 
 #if defined(USE_AURA)
+#include "chrome/browser/chrome_browser_parts_aura.h"
 #include "ui/aura/desktop.h"
 #endif
 
 using content::BrowserThread;
 
 namespace net {
 class NetLog;
 }  // namespace net
 
 namespace {
@@ skipping 338 matching lines @@
   } else {
     if (!parsed_command_line.HasSwitch(switches::kTestName)) {
       // We did not log in (we crashed or are debugging), so we need to
       // set the user name for sync.
       chromeos::LoginUtils::Get()->RestoreAuthenticationSession(
           chromeos::UserManager::Get()->logged_in_user().email(), profile);
     }
   }
 }
 
-#else
-
-void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line,
-                                       Profile* profile) {
-  // Dummy empty function for non-ChromeOS builds to avoid extra ifdefs below.
-}
-
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)
 OSStatus KeychainCallback(SecKeychainEvent keychain_event,
                           SecKeychainCallbackInfo *info, void *context) {
   return noErr;
 }
 #endif
 
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
@@ skipping 920 matching lines @@
         NOTREACHED();
     }
 #if !defined(OS_MACOSX)  // closing brace for if
   }
 #endif
 
 #if defined(USE_X11)
   SetBrowserX11ErrorHandlers();
 #endif
 
+  // TODO(stevenjb): Move this into a chrome specific stage.
+#if defined(USE_AURA)
+  ChromeBrowserPartsAura::SetupDesktop();
+#elif defined(TOOLKIT_VIEWS)
+  ChromeBrowserPartsViews::SetupDesktop();
+#endif
+
   // Profile creation ----------------------------------------------------------
 
 #if defined(OS_CHROMEOS)
   // Initialize the screen locker now so that it can receive
   // LOGIN_USER_CHANGED notification from UserManager.
   chromeos::ScreenLocker::InitClass();
 
   // This forces the ProfileManager to be created and register for the
   // notification it needs to track the logged in user.
   g_browser_process->profile_manager();
@@ skipping 45 matching lines @@
 
 #if defined(OS_CHROMEOS)
   // Pass the TokenService pointer to the policy connector so user policy can
   // grab a token and register with the policy server.
   // TODO(mnissler): Remove once OAuth is the only authentication mechanism.
   if (parsed_command_line().HasSwitch(switches::kLoginUser) &&
       !parsed_command_line().HasSwitch(switches::kLoginPassword)) {
     g_browser_process->browser_policy_connector()->SetUserPolicyTokenService(
         profile_->GetTokenService());
   }
+
+  // Tests should be able to tune login manager before showing it.
+  // Thus only show login manager in normal (non-testing) mode.
+  if (!parameters().ui_task)
+    OptionallyRunChromeOSLoginManager(parsed_command_line(), profile_);
 #endif
 
 #if !defined(OS_MACOSX)
   // Importing other browser settings is done in a browser-like process
   // that exits when this task has finished.
   // TODO(port): Port the Mac's IPC-based implementation to other platforms to
   //             replace this implementation. http://crbug.com/22142
   if (parsed_command_line().HasSwitch(switches::kImport) ||
       parsed_command_line().HasSwitch(switches::kImportFromFile)) {
     return FirstRun::ImportNow(profile_, parsed_command_line());
@@ skipping 262 matching lines @@
 
   run_message_loop_ = true;
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 // Called from MainMessageLoopRun().
 void ChromeBrowserMainParts::StartBrowserOrUITask() {
   // Still initializing, so need to allow IO.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-  // Set the notification UI manager after any desktop initialization in
-  // PreMainMessageLoopRun() is complete, and before starting the browser.
-  DesktopNotificationServiceFactory::GetForProfile(profile_)->SetUIManager(
-      g_browser_process->notification_ui_manager());
-
-  // Tests should be able to tune login manager before showing it.
-  // Thus only show login manager in normal (non-testing) mode.
-  if (!parameters().ui_task)
-    OptionallyRunChromeOSLoginManager(parsed_command_line(), profile_);
-
   if (parameters().ui_task) {
     // We are in test mode. Run one task and enter the main message loop.
 #if defined(OS_MACOSX)
     if (parameters().autorelease_pool)
       parameters().autorelease_pool->Recycle();
 #endif
     parameters().ui_task->Run();
     delete parameters().ui_task;
     run_message_loop_ = false;
   } else {
@@ skipping 211 matching lines @@
   if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
       (pre_read == "0" || pre_read == "1")) {
     std::string uma_name(name);
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }