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

Unified Diff: components/exo/wm_helper_ash.cc

Issue 2506263002: exo: Implement support for zcr_keyboard_configuration_v1 protocol. (Closed)
Patch Set: add one more TODO Created 4 years 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 f70155c7a562f8d7b5928e8424dceb7fab9d3a57..9026e20468c632ad6081a2b29980e4ec4dc7ce57 100644
--- a/components/exo/wm_helper_ash.cc
+++ b/components/exo/wm_helper_ash.cc
@@ -11,6 +11,7 @@
#include "base/memory/singleton.h"
#include "ui/aura/client/focus_client.h"
#include "ui/display/manager/display_manager.h"
+#include "ui/events/devices/device_data_manager.h"
#include "ui/wm/public/activation_client.h"
namespace exo {
@@ -24,6 +25,7 @@ WMHelperAsh::WMHelperAsh() {
aura::client::FocusClient* focus_client =
aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
focus_client->AddObserver(this);
+ ui::DeviceDataManager::GetInstance()->AddObserver(this);
}
WMHelperAsh::~WMHelperAsh() {
@@ -34,6 +36,7 @@ WMHelperAsh::~WMHelperAsh() {
focus_client->RemoveObserver(this);
ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
ash::WmShell::Get()->RemoveShellObserver(this);
+ ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
}
////////////////////////////////////////////////////////////////////////////////
@@ -133,4 +136,8 @@ void WMHelperAsh::OnMaximizeModeEnded() {
NotifyMaximizeModeEnded();
}
+void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() {
+ NotifyKeyboardDeviceConfigurationChanged();
+}
+
} // namespace exo
« 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