Renamed OutputConfigurator to DisplayConfigurator

apps/shell/browser/shell_desktop_controller.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 "apps/shell/browser/shell_desktop_controller.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 32 matching lines @@
  private:
   aura::Window* root_window_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate);
 };
 
 }  // namespace
 
 ShellDesktopController::ShellDesktopController() {
 #if defined(OS_CHROMEOS)
-  output_configurator_.reset(new ui::OutputConfigurator);
-  output_configurator_->Init(false);
-  output_configurator_->ForceInitialConfigure(0);
-  output_configurator_->AddObserver(this);
+  display_configurator_.reset(new ui::DisplayConfigurator);
+  display_configurator_->Init(false);
+  display_configurator_->ForceInitialConfigure(0);
+  display_configurator_->AddObserver(this);
 #endif
   CreateRootWindow();
 
   DCHECK(!views::ViewsDelegate::views_delegate);
   views::ViewsDelegate::views_delegate =
       new ShellViewsDelegate(wm_test_helper_->host()->window());
 }
 
 ShellDesktopController::~ShellDesktopController() {
   delete views::ViewsDelegate::views_delegate;
   views::ViewsDelegate::views_delegate = NULL;
   DestroyRootWindow();
   aura::Env::DeleteInstance();
 }
 
 aura::WindowTreeHost* ShellDesktopController::GetWindowTreeHost() {
   return wm_test_helper_->host();
 }
 
 #if defined(OS_CHROMEOS)
 void ShellDesktopController::OnDisplayModeChanged(
-    const std::vector<ui::OutputConfigurator::DisplayState>& outputs) {
+    const std::vector<ui::DisplayConfigurator::DisplayState>& outputs) {
   gfx::Size size = GetPrimaryDisplaySize();
   if (!size.IsEmpty())
     wm_test_helper_->host()->UpdateRootWindowSize(size);
 }
 #endif
 
 void ShellDesktopController::CreateRootWindow() {
   test_screen_.reset(aura::TestScreen::Create());
   // TODO(jamescook): Replace this with a real Screen implementation.
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
@@ skipping 11 matching lines @@
   wm_test_helper_->host()->Show();
 }
 
 void ShellDesktopController::DestroyRootWindow() {
   wm_test_helper_.reset();
   ui::ShutdownInputMethodForTesting();
 }
 
 gfx::Size ShellDesktopController::GetPrimaryDisplaySize() {
 #if defined(OS_CHROMEOS)
-  const std::vector<ui::OutputConfigurator::DisplayState>& states =
-      output_configurator_->cached_outputs();
+  const std::vector<ui::DisplayConfigurator::DisplayState>& states =
+      display_configurator_->cached_outputs();
   if (states.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = states[0].display->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace apps