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

Unified Diff: ash/common/wm/maximize_mode/maximize_mode_controller.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/date/date_default_view.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/maximize_mode/maximize_mode_controller.cc
diff --git a/ash/common/wm/maximize_mode/maximize_mode_controller.cc b/ash/common/wm/maximize_mode/maximize_mode_controller.cc
index e2d4e0c286fd3bf7ab6d6c9d7dfd93436a2bca30..9527ab3aa5fc12d8008f4839adde9db24a480f2d 100644
--- a/ash/common/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_controller.cc
@@ -21,7 +21,8 @@
#include "ui/gfx/geometry/vector3d_f.h"
#if defined(OS_CHROMEOS)
-#include "chromeos/dbus/dbus_thread_manager.h"
+#include "ash/common/dbus_thread_manager_ash.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
#include "ui/chromeos/accelerometer/accelerometer_util.h"
#endif // OS_CHROMEOS
@@ -114,7 +115,7 @@ MaximizeModeController::MaximizeModeController()
#if defined(OS_CHROMEOS)
if (is_enabled)
chromeos::AccelerometerReader::GetInstance()->AddObserver(this);
- chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
+ DBusThreadManagerAsh::Get()->GetPowerManagerClient()->AddObserver(
this);
#endif // OS_CHROMEOS
}
@@ -128,7 +129,7 @@ MaximizeModeController::~MaximizeModeController() {
#if defined(OS_CHROMEOS)
if (is_enabled)
chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this);
- chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
+ DBusThreadManagerAsh::Get()->GetPowerManagerClient()->RemoveObserver(
this);
#endif // OS_CHROMEOS
}
« no previous file with comments | « ash/common/system/date/date_default_view.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698