Fix login visual hitch on chromebook

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/bind.h"
@@ skipping 260 matching lines @@
       // Disable Num Lock on X start up for http://crosbug.com/29169.
       input_method::GetInputMethodManager()->GetXKeyboard()->
           SetNumLockEnabled(false);
     }
 
     // Initialize the device settings service so that we'll take actions per
     // signals sent from the session manager.
     DeviceSettingsService::Get()->Initialize(
         DBusThreadManager::Get()->GetSessionManagerClient(),
         OwnerKeyUtil::Create());
-
-    // Add observers for WallpaperManager. This depends on PowerManagerClient().
-    WallpaperManager::Get()->AddObservers();
   }
 
   // TODO(stevenjb): Move this into DBusServices() once the switch is no
   // longer required. (Switch is set in about_flags.cc and not applied until
   // after DBusServices() is called).
   void InitializeNetworkHandlers() {
     network_handlers_initialized_ = true;
 
     // Always initialize these handlers which should not conflict with
     // NetworkLibrary.
@@ skipping 237 matching lines @@
 
   if (!app_order_loader_) {
     app_order_loader_.reset(
         new default_app_order::ExternalLoader(true /* async */));
   }
 
   // Initialize magnification manager before ash tray is created. And this must
   // be placed after UserManager::SessionStarted();
   chromeos::MagnificationManager::Initialize();
 
+  // Add observers for WallpaperManager. This depends on PowerManagerClient,
+  // TimezoneSettings and CrosSettings.
+  WallpaperManager::Get()->AddObservers();
+
 #if defined(USE_LINUX_BREAKPAD)
   cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL,
                                   base::Bind(&ChromeOSVersionCallback),
                                   &tracker_);
 #endif
 
   // In Aura builds this will initialize ash::Shell.
   ChromeBrowserMainPartsLinux::PreProfileInit();
 }
 
@@ skipping 169 matching lines @@
 
   // Detach D-Bus clients before DBusThreadManager is shut down.
   power_button_observer_.reset();
   screen_dimming_observer_.reset();
 
   // Delete ContactManager while |g_browser_process| is still alive.
   contact_manager_.reset();
 
   chromeos::MagnificationManager::Shutdown();
 
-  // Let the UserManager unregister itself as an observer of the CrosSettings
-  // singleton before it is destroyed.
+  // Let the UserManager and WallpaperManager unregister itself as an observer
+  // of the CrosSettings singleton before it is destroyed.
   UserManager::Get()->Shutdown();
+  WallpaperManager::Get()->Shutdown();
 
   ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
 }
 
 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() {
   SetupLowMemoryHeadroomFieldTrial();
   SetupZramFieldTrial();
 }
 
 void ChromeBrowserMainPartsChromeos::SetupLowMemoryHeadroomFieldTrial() {
@@ skipping 79 matching lines @@
   trial->AppendGroup("2GB_RAM_3GB_swap", zram_group == '2' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_no_swap", zram_group == '3' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
 }
 
 }  //  namespace chromeos