Fix namespace for src/ui/display/.

ash/touch/touch_observer_hud.h

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)

[rjkroege, 2017/01/04 21:19:50]

Now that james has removed ash support for CrOS, seems like the #ifdef could be
removed?

[oshima, 2017/01/05 22:21:25]

Not sure if I understand. Can you elaborate?

[kylechar, 2017/01/05 22:29:17]

I think rjkroege means that the "ash" target will only build if is_chromeos=true
now (there is an assert in ash/BUILD.gn to make sure of it). So this #ifdef has
to always be true. There is a lot of similar #ifdefs scattered throughout ash.

[oshima, 2017/01/06 00:07:09]

Oh, so he meant Win/Linux not CrOS?

-                                    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.