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

chrome/browser/chromeos/accessibility/chromevox_panel.cc

 // Copyright 2015 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/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/chromevox_panel.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
 #include "ui/chromeos/accessibility_types.h"
+#include "ui/display/screen.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_animations.h"
 
 namespace {
 
 const int kPanelHeight = 35;
 const char kChromeVoxPanelRelativeUrl[] = "/cvox2/background/panel.html";
@@ skipping 58 matching lines @@
   aura::Window* root_window = ash::Shell::GetPrimaryRootWindow();
   params.parent = ash::Shell::GetContainer(
       root_window, ash::kShellWindowId_SettingBubbleContainer);
   params.delegate = this;
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   params.bounds = gfx::Rect(0, 0, root_window->bounds().width(),
                             root_window->bounds().height());
   widget_->Init(params);
   SetShadowType(widget_->GetNativeWindow(), wm::SHADOW_TYPE_RECTANGULAR);
 
-  gfx::Screen::GetScreen()->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 }
 
 ChromeVoxPanel::~ChromeVoxPanel() {
-  gfx::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 aura::Window* ChromeVoxPanel::GetRootWindow() {
   return GetWidget()->GetNativeWindow()->GetRootWindow();
 }
 
 void ChromeVoxPanel::Close() {
   widget_->Close();
 }
 
@@ skipping 45 matching lines @@
 }
 
 void ChromeVoxPanel::DeleteDelegate() {
   delete this;
 }
 
 views::View* ChromeVoxPanel::GetContentsView() {
   return web_view_;
 }
 
-void ChromeVoxPanel::OnDisplayMetricsChanged(const gfx::Display& display,
+void ChromeVoxPanel::OnDisplayMetricsChanged(const display::Display& display,
                                              uint32_t changed_metrics) {
   UpdateWidgetBounds();
 }
 
 void ChromeVoxPanel::UpdateWidgetBounds() {
   gfx::Rect bounds(GetRootWindow()->bounds().size());
   if (!panel_fullscreen_)
     bounds.set_height(kPanelHeight);
 
   // If we're in full-screen mode, give the panel a height of 0 unless
   // it's active.
   if (ash::GetRootWindowController(GetRootWindow())
           ->GetWindowForFullscreenMode() &&
       !widget_->IsActive()) {
     bounds.set_height(0);
   }
 
   widget_->SetBounds(bounds);
 }