chromeos: Change all clients of LoginLibrary to use SessionManagerClient.

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"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #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/session_manager_client.h"
+#include "chrome/browser/chromeos/login/session_manager_observer.h"
 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/common/main_function_params.h"
 #include "net/base/network_change_notifier.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
@@ skipping 42 matching lines @@
     base::LINKER_INITIALIZED);
 
 ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
     const MainFunctionParams& parameters)
     : ChromeBrowserMainPartsBase(parameters) {
 }
 
 ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
   // We should remove observers attached to D-Bus clients before
   // DBusThreadManager is shut down.
+  if (session_manager_observer_.get()) {
+    chromeos::DBusThreadManager::Get()->session_manager_client()->
+        RemoveObserver(session_manager_observer_.get());
+  }
   if (brightness_observer_.get()) {
     chromeos::DBusThreadManager::Get()->power_manager_client()->RemoveObserver(
         brightness_observer_.get());
   }
 
   chromeos::DBusThreadManager::Shutdown();
 
   if (!parameters().ui_task && chromeos::CrosLibrary::Get())
     chromeos::CrosLibrary::Shutdown();
 
@@ skipping 44 matching lines @@
 
   // Initialize DBusThreadManager for the browser. This must be done after
   // the main message loop is started, as it uses the message loop.
   chromeos::DBusThreadManager::Initialize();
 
   // Initialize the brightness observer so that we'll display an onscreen
   // indication of brightness changes during login.
   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);
+  chromeos::DBusThreadManager::Get()->session_manager_client()->
+      AddObserver(session_manager_observer_.get());
 }