Chromium Code Reviews| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| index 0a0c600d3f1d9bf618b2e82f61b53d5d7094fc9c..2da678db3d88d42b78734cd27c835dedcc07bacb 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -14,6 +14,7 @@ |
| #include "chrome/browser/chromeos/brightness_observer.h" |
| #include "chrome/browser/chromeos/cros/cros_library.h" |
| #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" |
| +#include "chrome/browser/chromeos/dbus/power_manager_client.h" |
| #include "chrome/browser/chromeos/dbus/session_manager_client.h" |
| #include "chrome/browser/chromeos/login/session_manager_observer.h" |
| #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" |
| @@ -120,10 +121,6 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() { |
| bool use_stub = parameters().command_line_.HasSwitch(switches::kStubCros); |
| chromeos::CrosLibrary::Initialize(use_stub); |
| } |
| - // Replace the default NetworkChangeNotifierFactory with ChromeOS specific |
| - // implementation. |
| - net::NetworkChangeNotifier::SetFactory( |
| - new chromeos::CrosNetworkChangeNotifierFactory()); |
| } |
| void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
| @@ -143,11 +140,17 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() { |
| // the main message loop is started, as it uses the message loop. |
| chromeos::DBusThreadManager::Initialize(); |
| + // Replace the default NetworkChangeNotifierFactory with ChromeOS specific |
| + // implementation. |
|
satorux1
2011/10/29 02:28:48
Please add some comment that this needs to be done
Simon Que
2011/11/02 00:13:43
Done.
|
| + net::NetworkChangeNotifier::SetFactory( |
| + new chromeos::CrosNetworkChangeNotifierFactory()); |
| + |
| // Initialize the brightness observer so that we'll display an onscreen |
| - // indication of brightness changes during login. |
| + // indication of brightness changes. |
| brightness_observer_.reset(new chromeos::BrightnessObserver()); |
| chromeos::DBusThreadManager::Get()->power_manager_client()->AddObserver( |
| brightness_observer_.get()); |
| + |
| // Initialize the session manager observer so that we'll take actions |
| // per signals sent from the session manager. |
| session_manager_observer_.reset(new chromeos::SessionManagerObserver); |