Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(948)

Unified Diff: ash/common/system/chromeos/system_clock_observer.cc

Issue 2319783002: mash: Allow a subset of D-Bus clients to be created in DBusThreadManager (Closed)
Patch Set: WIP, add DBusThreadManagerAsh and DBusThreadManagerChrome Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/chromeos/power/power_status.cc ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « ash/common/system/chromeos/power/power_status.cc ('k') | ash/common/system/date/date_default_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698