Fix namespace for src/ui/display/.

ash/display/window_tree_host_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/window_tree_host_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <memory>
@@ skipping 816 matching lines @@
     observer.OnDisplayConfigurationChanged();
   UpdateMouseLocationAfterDisplayChange();
 
 #if defined(USE_X11) && defined(OS_CHROMEOS)
   if (must_clear_window)
     ui::ClearX11DefaultRootWindow();
 #endif
 }
 
 #if defined(OS_CHROMEOS)
-ui::DisplayConfigurator* WindowTreeHostManager::display_configurator() {
+display::DisplayConfigurator* WindowTreeHostManager::display_configurator() {
   return Shell::GetInstance()->display_configurator();
 }
 #endif
 
 ui::EventDispatchDetails WindowTreeHostManager::DispatchKeyEventPostIME(
     ui::KeyEvent* event) {
   // Getting the active root window to dispatch the event. This isn't
   // significant as the event will be sent to the window resolved by
   // aura::client::FocusClient which is FocusController in ash.
   aura::Window* active_window = wm::GetActiveWindow();
@@ skipping 42 matching lines @@
   SetDisplayPropertiesOnHost(ash_host, display);
 
 #if defined(OS_CHROMEOS)
   if (switches::ConstrainPointerToRoot())
     ash_host->ConfineCursorToRootWindow();
 #endif
   return ash_host;
 }
 
 }  // namespace ash