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

ash/display/shared_display_edge_indicator.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/shared_display_edge_indicator.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 const int kIndicatorAnimationDurationMs = 1000;
 
 class IndicatorView : public views::View {
  public:
@@ skipping 23 matching lines @@
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.keep_on_top = true;
   // We set the context to the primary root window; this is OK because the ash
   // stacking controller will still place us in the correct RootWindow.
   params.context = Shell::GetPrimaryRootWindow();
   widget->set_focus_on_creation(false);
   widget->Init(params);
   widget->SetVisibilityChangedAnimationsEnabled(false);
   widget->GetNativeWindow()->SetName("SharedEdgeIndicator");
   widget->SetContentsView(contents_view);
-  gfx::Display display = gfx::Screen::GetScreen()->GetDisplayMatching(bounds);
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayMatching(bounds);
   aura::Window* window = widget->GetNativeWindow();
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(window->GetRootWindow());
   screen_position_client->SetBounds(window, bounds, display);
   widget->Show();
   return widget;
 }
 
 }  // namespace
 
@@ skipping 33 matching lines @@
   int value = animation->CurrentValueBetween(0, 255);
   SkColor color = SkColorSetARGB(0xFF, value, value, value);
   if (src_indicator_)
     static_cast<IndicatorView*>(src_indicator_)->SetColor(color);
   if (dst_indicator_)
     static_cast<IndicatorView*>(dst_indicator_)->SetColor(color);
 
 }
 
 }  // namespace ash