chromeos: Move system resume handling to power manager client

chrome/browser/chromeos/chrome_browser_main_chromeos.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/chromeos/chrome_browser_main_chromeos.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 74 matching lines @@
 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsLinux(parameters) {
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
   chromeos::disks::DiskMountManager::Shutdown();
 
   chromeos::BluetoothManager::Shutdown();
 
+  chromeos::accessibility::SystemEventObserver::Shutdown();

[satorux1, 2011/11/23 19:38:09]

initialization and shutdown should be done in the reversed order:

initialize A, B, C
shutdown C, B, A.

Please reorder properly.

[Simon Que, 2011/11/23 19:42:29]

Done.

[satorux1, 2011/11/23 20:18:01]

Noooo, this doesn't look like the right order.

The initialization looks like:

chromeos::DBusThreadManager::Initialize();
...
chromeos::disks::DiskMountManager::Initialize();
chromeos::accessibility::SystemEventObserver::Initialize();

Then, the shutdown should look like

chromeos::accessibility::SystemEventObserver::Shutdown();
chromeos::disks::DiskMountManager::Shutdown();
chromeos::DBusThreadManager::Shutdown();

+
   chromeos::DBusThreadManager::Shutdown();
 
-  chromeos::accessibility::SystemEventObserver::Shutdown();
-
   if (!parameters().ui_task && chromeos::CrosLibrary::Get())
     chromeos::CrosLibrary::Shutdown();
 
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 }
 
@@ skipping 13 matching lines @@
   // Initialize CrosLibrary only for the browser, unless running tests
   // (which do their own CrosLibrary setup).
   if (!parameters().ui_task) {
     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());
-
-  chromeos::accessibility::SystemEventObserver::Initialize();
 }
 
 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
   // FILE thread is created in ChromeBrowserMainParts::PreMainMessageLoopRun().
   ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
   // Get the statistics provider instance here to start loading statistcs
   // on the background FILE thread.
   chromeos::system::StatisticsProvider::GetInstance();
 
   // Initialize the Chrome OS bluetooth subsystem.
@@ skipping 23 matching lines @@
       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);
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       AddObserver(session_manager_observer_.get());
 
   // Initialize the disk mount manager.
   chromeos::disks::DiskMountManager::Initialize();
 
+  // Initialize the system event observer.
+  chromeos::accessibility::SystemEventObserver::Initialize();
+
   // Initialize the network change notifier for Chrome OS. The network
   // change notifier starts to monitor changes from the power manager and
   // the network manager.
   chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init();
 
   // Likewise, initialize the upgrade detector for Chrome OS. The upgrade
   // detector starts to monitor changes from the update engine.
   UpgradeDetectorChromeos::GetInstance()->Init();
 
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
@@ skipping 28 matching lines @@
   // DBusThreadManager is shut down.
   if (session_manager_observer_.get()) {
     chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
         RemoveObserver(session_manager_observer_.get());
   }
   if (brightness_observer_.get()) {
     chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
         ->RemoveObserver(brightness_observer_.get());
   }
 }