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

Unified Diff: ash/touch/touch_observer_hud.h

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/shell.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud.h
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
index 97e5766f14405053c51dc75b5d7f14242cd4b454..b3c6ee2af232f598ef5f470ca55b2b7d6b935683 100644
--- a/ash/touch/touch_observer_hud.h
+++ b/ash/touch/touch_observer_hud.h
@@ -26,13 +26,14 @@ namespace ash {
// An event filter which handles system level gesture events. Objects of this
// class manage their own lifetime.
-class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
- public views::WidgetObserver,
- public display::DisplayObserver,
+class ASH_EXPORT TouchObserverHUD
+ : public ui::EventHandler,
+ public views::WidgetObserver,
+ public display::DisplayObserver,
#if defined(OS_CHROMEOS)
- public ui::DisplayConfigurator::Observer,
+ public display::DisplayConfigurator::Observer,
#endif // defined(OS_CHROMEOS)
- public WindowTreeHostManager::Observer {
+ public WindowTreeHostManager::Observer {
public:
// Called to clear touch points and traces from the screen. Default
// implementation does nothing. Sub-classes should implement appropriately.
@@ -68,9 +69,9 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
uint32_t metrics) override;
#if defined(OS_CHROMEOS)
- // Overriden from ui::DisplayConfigurator::Observer.
+ // Overriden from display::DisplayConfigurator::Observer.
void OnDisplayModeChanged(
- const ui::DisplayConfigurator::DisplayStateList& outputs) override;
+ const display::DisplayConfigurator::DisplayStateList& outputs) override;
#endif // defined(OS_CHROMEOS)
// Overriden form WindowTreeHostManager::Observer.
« no previous file with comments | « ash/shell.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698