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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 2028593004: Add new InputDeviceManager interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_keyboard
Patch Set: Fix windows compile error. Created 4 years, 7 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 | « no previous file | ash/touch/touch_transformer_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos.cc
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 819a507b64da224f10fb9546238c4a3c7f6d9a3b..68493a19d07906330aba775c4bd261d11d5d80cf 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -29,7 +29,7 @@
#include "ui/display/types/display_mode.h"
#include "ui/display/types/display_snapshot.h"
#include "ui/display/util/display_util.h"
-#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/input_device_manager.h"
#include "ui/events/devices/touchscreen_device.h"
namespace ash {
@@ -144,11 +144,11 @@ std::vector<DisplayMode> DisplayChangeObserver::GetExternalDisplayModeList(
DisplayChangeObserver::DisplayChangeObserver() {
Shell::GetInstance()->AddShellObserver(this);
- ui::DeviceDataManager::GetInstance()->AddObserver(this);
+ ui::InputDeviceManager::GetInstance()->AddObserver(this);
}
DisplayChangeObserver::~DisplayChangeObserver() {
- ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
+ ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
Shell::GetInstance()->RemoveShellObserver(this);
}
@@ -269,7 +269,8 @@ void DisplayChangeObserver::OnDisplayModeChanged(
}
AssociateTouchscreens(
- &displays, ui::DeviceDataManager::GetInstance()->touchscreen_devices());
+ &displays,
+ ui::InputDeviceManager::GetInstance()->GetTouchscreenDevices());
// DisplayManager can be null during the boot.
Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
« no previous file with comments | « no previous file | ash/touch/touch_transformer_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698