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

Unified Diff: components/exo/wm_helper_ash.cc

Issue 2778913002: exo: Clean up cursor code (Closed)
Patch Set: Rebase Created 3 years, 9 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 | « components/exo/wm_helper_ash.h ('k') | components/exo/wm_helper_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/wm_helper_ash.cc
diff --git a/components/exo/wm_helper_ash.cc b/components/exo/wm_helper_ash.cc
index b75a6bf9feb030720c1c2d98ad807aeec8338058..60f8119d2bd4fdd299f8485c2fa8449fdb8accb5 100644
--- a/components/exo/wm_helper_ash.cc
+++ b/components/exo/wm_helper_ash.cc
@@ -23,6 +23,7 @@ namespace exo {
WMHelperAsh::WMHelperAsh() {
ash::Shell::GetInstance()->AddShellObserver(this);
ash::Shell::GetInstance()->activation_client()->AddObserver(this);
+ ash::Shell::GetInstance()->cursor_manager()->AddObserver(this);
ash::WmShell::Get()->AddDisplayObserver(this);
aura::client::FocusClient* focus_client =
aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
@@ -38,6 +39,7 @@ WMHelperAsh::~WMHelperAsh() {
aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
focus_client->RemoveObserver(this);
ash::WmShell::Get()->RemoveDisplayObserver(this);
+ ash::Shell::GetInstance()->cursor_manager()->RemoveObserver(this);
ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
ash::Shell::GetInstance()->RemoveShellObserver(this);
ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
« no previous file with comments | « components/exo/wm_helper_ash.h ('k') | components/exo/wm_helper_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698