Rename gfx::Display/Screen to display::Display/Screen in chrome

chrome/browser/ui/webui/options/chromeos/display_overscan_handler.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/webui/options/chromeos/display_overscan_handler.h"
 
 #include <string>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/overscan_calibrator.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace chromeos {
 namespace options {
 namespace {
 
 // The value for the orientation of overscan operations.
 const char kOrientationHorizontal[] = "horizontal";
 const char kOrientationVertical[] = "vertical";
 
 }
 
 DisplayOverscanHandler::DisplayOverscanHandler() {
-  gfx::Screen::GetScreen()->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 }
 
 DisplayOverscanHandler::~DisplayOverscanHandler() {
-  gfx::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 void DisplayOverscanHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   RegisterTitle(localized_strings, "displayOverscanPage",
                 IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_TAB_TITLE);
   localized_strings->SetString("shrinkAndExpand", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_SHRINK_EXPAND));
   localized_strings->SetString("move", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OVERSCAN_MOVE));
@@ skipping 25 matching lines @@
   web_ui()->RegisterMessageCallback(
       "move",
       base::Bind(&DisplayOverscanHandler::HandleMove,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "resize",
       base::Bind(&DisplayOverscanHandler::HandleResize,
                  base::Unretained(this)));
 }
 
-void DisplayOverscanHandler::OnDisplayAdded(const gfx::Display& new_display) {
+void DisplayOverscanHandler::OnDisplayAdded(
+    const display::Display& new_display) {
   if (!overscan_calibrator_)
     return;
 
   web_ui()->CallJavascriptFunction(
       "options.DisplayOverscan.onOverscanCanceled");
 }
 
-void DisplayOverscanHandler::OnDisplayRemoved(const gfx::Display& old_display) {
+void DisplayOverscanHandler::OnDisplayRemoved(
+    const display::Display& old_display) {
   if (!overscan_calibrator_)
     return;
 
   web_ui()->CallJavascriptFunction(
       "options.DisplayOverscan.onOverscanCanceled");
 }
 
-void DisplayOverscanHandler::OnDisplayMetricsChanged(const gfx::Display&,
-                                                     uint32_t) {
-}
+void DisplayOverscanHandler::OnDisplayMetricsChanged(const display::Display&,
+                                                     uint32_t) {}
 
 void DisplayOverscanHandler::HandleStart(const base::ListValue* args) {
-  int64_t display_id = gfx::Display::kInvalidDisplayID;
+  int64_t display_id = display::Display::kInvalidDisplayID;
   std::string id_value;
   if (!args->GetString(0, &id_value)) {
     LOG(ERROR) << "Can't find ID";
     return;
   }
 
   if (!base::StringToInt64(id_value, &display_id) ||
-      display_id == gfx::Display::kInvalidDisplayID) {
+      display_id == display::Display::kInvalidDisplayID) {
     LOG(ERROR) << "Invalid parameter: " << id_value;
     return;
   }
 
-  const gfx::Display& display =
+  const display::Display& display =
       ash::Shell::GetInstance()->display_manager()->GetDisplayForId(display_id);
   DCHECK(display.is_valid());
   if (!display.is_valid())
     return;
 
   ash::WindowTreeHostManager* window_tree_host_manager =
       ash::Shell::GetInstance()->window_tree_host_manager();
   overscan_calibrator_.reset(new OverscanCalibrator(
       display, window_tree_host_manager->GetOverscanInsets(display_id)));
 }
@@ skipping 71 matching lines @@
     LOG(ERROR) << "The orientation must be '" << kOrientationHorizontal
                << "' or '" << kOrientationVertical << "': "
                << orientation;
     return;
   }
   overscan_calibrator_->UpdateInsets(insets);
 }
 
 }  // namespace options
 }  // namespace chromeos