| Index: ash/display/shared_display_edge_indicator.cc
|
| diff --git a/ash/display/shared_display_edge_indicator.cc b/ash/display/shared_display_edge_indicator.cc
|
| index aaec4db4dc93cf2068183580df0a0718ba67793e..75b9d8ebfe7f3c53cedf978009b3872a622d5731 100644
|
| --- a/ash/display/shared_display_edge_indicator.cc
|
| +++ b/ash/display/shared_display_edge_indicator.cc
|
| @@ -9,10 +9,10 @@
|
| #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"
|
|
|
| @@ -56,7 +56,8 @@ views::Widget* CreateWidget(const gfx::Rect& bounds,
|
| 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());
|
|
|