| Index: ash/common/system/chromeos/system_clock_observer.cc
|
| diff --git a/ash/common/system/chromeos/system_clock_observer.cc b/ash/common/system/chromeos/system_clock_observer.cc
|
| index 984c6ca11aa406935bf27589163994dad492d91e..490fdca26bcad1f1dfa7264842ead31d745e40b4 100644
|
| --- a/ash/common/system/chromeos/system_clock_observer.cc
|
| +++ b/ash/common/system/chromeos/system_clock_observer.cc
|
| @@ -4,22 +4,23 @@
|
|
|
| #include "ash/common/system/chromeos/system_clock_observer.h"
|
|
|
| +#include "ash/common/dbus_thread_manager_ash.h"
|
| #include "ash/common/system/tray/system_tray_notifier.h"
|
| #include "ash/common/wm_shell.h"
|
| -#include "chromeos/dbus/dbus_thread_manager.h"
|
| +// #include "chromeos/dbus/dbus_thread_manager.h"
|
| +#include "chromeos/dbus/system_clock_client.h"
|
|
|
| namespace ash {
|
|
|
| SystemClockObserver::SystemClockObserver() {
|
| - chromeos::DBusThreadManager::Get()->GetSystemClockClient()->AddObserver(this);
|
| + DBusThreadManagerAsh::Get()->GetSystemClockClient()->AddObserver(this);
|
| chromeos::system::TimezoneSettings::GetInstance()->AddObserver(this);
|
| can_set_time_ =
|
| - chromeos::DBusThreadManager::Get()->GetSystemClockClient()->CanSetTime();
|
| + DBusThreadManagerAsh::Get()->GetSystemClockClient()->CanSetTime();
|
| }
|
|
|
| SystemClockObserver::~SystemClockObserver() {
|
| - chromeos::DBusThreadManager::Get()->GetSystemClockClient()->RemoveObserver(
|
| - this);
|
| + DBusThreadManagerAsh::Get()->GetSystemClockClient()->RemoveObserver(this);
|
| chromeos::system::TimezoneSettings::GetInstance()->RemoveObserver(this);
|
| }
|
|
|
|
|