chromeos: Move system resume handling to power manager client

chrome/browser/chromeos/accessibility/system_event_observer.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/accessibility/system_event_observer.h"
 
 #include "base/logging.h"
 #include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 
 namespace chromeos {
 namespace accessibility {
 
 namespace {
 
 SystemEventObserver* g_system_event_observer = NULL;
 
 }
 
 SystemEventObserver::SystemEventObserver() {
-  CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
   CrosLibrary::Get()->GetScreenLockLibrary()->AddObserver(this);

[satorux1, 2011/11/23 08:24:48]

Looking at chrome_browser_main_chromeos.cc, this seems to be called _before_
DBusThreadManager is created. Hence, we should introduce Init() to do this and
call it after DBusThreadManager is created, just like we did for
NetworkChangeNotifierChromeos. See chrome_browser_main_chromeos.cc, for details.

[satorux1, 2011/11/23 18:25:57]

I take it back. Forget about adding Init(). I think you can just move the call
to chromeos::accessibility::SystemEventObserver::Initialize() to a place after
the DBusThreadManager is created.

You should also move chromeos::accessibility::SystemEventObserver::Shutdown() to
a place before DBusThreadManager is shut down.

[Simon Que, 2011/11/23 18:35:23]

Isn't Initialize() a static function?

[Simon Que, 2011/11/23 18:36:07]

Oh I see that it has a single instance.

[Simon Que, 2011/11/23 19:24:17]

Done.

 }
 
 SystemEventObserver::~SystemEventObserver() {
   CrosLibrary::Get()->GetScreenLockLibrary()->RemoveObserver(this);
-  CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);

[satorux1, 2011/11/23 08:24:48]

Introduce Shutdown() to do this.

 }
 
 void SystemEventObserver::SystemResumed() {
   Profile* profile = ProfileManager::GetDefaultProfile();
   WokeUpEventInfo info(profile);
   SendAccessibilityNotification(
       chrome::NOTIFICATION_ACCESSIBILITY_WOKE_UP, &info);
 }
 
 void SystemEventObserver::LockScreen(ScreenLockLibrary* screen_lock_library) {
@@ skipping 25 matching lines @@
 // static
 void SystemEventObserver::Shutdown() {
   DCHECK(g_system_event_observer);
   delete g_system_event_observer;
   g_system_event_observer = NULL;
   VLOG(1) << "SystemEventObserver Shutdown completed";
 }
 
 }  // namespace accessibility
 }  // namespace chromeos