Fix namespace for src/ui/display/.

extensions/shell/browser/shell_desktop_controller_aura.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller_aura.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 164 matching lines @@
 
 }  // namespace
 
 ShellDesktopControllerAura::ShellDesktopControllerAura()
     : app_window_client_(new ShellAppWindowClient) {
   extensions::AppWindowClient::Set(app_window_client_.get());
 
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
       this);
-  display_configurator_.reset(new ui::DisplayConfigurator);
+  display_configurator_.reset(new display::DisplayConfigurator);
 #if defined(USE_OZONE)
   display_configurator_->Init(
       ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(), false);
 #elif defined(USE_X11)
-  display_configurator_->Init(base::MakeUnique<ui::NativeDisplayDelegateX11>(),
-                              false);
+  display_configurator_->Init(
+      base::MakeUnique<display::NativeDisplayDelegateX11>(), false);
 #endif
   display_configurator_->ForceInitialConfigure(0);
   display_configurator_->AddObserver(this);
 #endif
   CreateRootWindow();
 }
 
 ShellDesktopControllerAura::~ShellDesktopControllerAura() {
   CloseAppWindows();
   DestroyRootWindow();
@@ skipping 49 matching lines @@
     bool down,
     const base::TimeTicks& timestamp) {
   if (down) {
     chromeos::DBusThreadManager::Get()
         ->GetPowerManagerClient()
         ->RequestShutdown();
   }
 }
 
 void ShellDesktopControllerAura::OnDisplayModeChanged(
-    const ui::DisplayConfigurator::DisplayStateList& displays) {
+    const display::DisplayConfigurator::DisplayStateList& displays) {
   gfx::Size size = GetPrimaryDisplaySize();
   if (!size.IsEmpty())
     host_->UpdateRootWindowSizeInPixels(size);
 }
 #endif
 
 void ShellDesktopControllerAura::OnHostCloseRequested(
     const aura::WindowTreeHost* host) {
   DCHECK_EQ(host_.get(), host);
   CloseAppWindows();
@@ skipping 107 matching lines @@
   user_activity_notifier_.reset();
 #endif
   user_activity_detector_.reset();
   host_.reset();
   display::Screen::SetScreenInstance(nullptr);
   screen_.reset();
 }
 
 gfx::Size ShellDesktopControllerAura::GetPrimaryDisplaySize() {
 #if defined(OS_CHROMEOS)
-  const ui::DisplayConfigurator::DisplayStateList& displays =
+  const display::DisplayConfigurator::DisplayStateList& displays =
       display_configurator_->cached_displays();
   if (displays.empty())
     return gfx::Size();
-  const ui::DisplayMode* mode = displays[0]->current_mode();
+  const display::DisplayMode* mode = displays[0]->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace extensions