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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 2520143002: Move touchscreen_util.cc/h from ash to ui. (Closed)
Patch Set: Rebase. Created 4 years, 1 month 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/BUILD.gn ('k') | ash/touch/touchscreen_util.h » ('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 f0f91613529ba7a37d70b5008316e389831f2322..352bd72341313143841576964f5891744beb0562 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -14,13 +14,13 @@
#include "ash/common/wm_shell.h"
#include "ash/display/display_util.h"
#include "ash/shell.h"
-#include "ash/touch/touchscreen_util.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/user_activity/user_activity_detector.h"
#include "ui/compositor/dip_util.h"
+#include "ui/display/chromeos/touchscreen_util.h"
#include "ui/display/display.h"
#include "ui/display/manager/display_layout.h"
#include "ui/display/manager/display_layout_store.h"
@@ -277,7 +277,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
new_info.set_maximum_cursor_size(state->maximum_cursor_size());
}
- AssociateTouchscreens(
+ display::AssociateTouchscreens(
&displays,
ui::InputDeviceManager::GetInstance()->GetTouchscreenDevices());
// DisplayManager can be null during the boot.
« no previous file with comments | « ash/BUILD.gn ('k') | ash/touch/touchscreen_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698