| Index: extensions/browser/api/system_display/display_info_provider.cc
|
| diff --git a/extensions/browser/api/system_display/display_info_provider.cc b/extensions/browser/api/system_display/display_info_provider.cc
|
| index c53c606cb88d6cb72f1333ac474d6bbb1a0ba3fa..8260a842e9cc4231a3cbd59de819dbe9fc9a87c5 100644
|
| --- a/extensions/browser/api/system_display/display_info_provider.cc
|
| +++ b/extensions/browser/api/system_display/display_info_provider.cc
|
| @@ -6,8 +6,8 @@
|
|
|
| #include "base/strings/string_number_conversions.h"
|
| #include "extensions/common/api/system_display.h"
|
| -#include "ui/gfx/display.h"
|
| -#include "ui/gfx/screen.h"
|
| +#include "ui/display/display.h"
|
| +#include "ui/display/screen.h"
|
|
|
| namespace extensions {
|
|
|
| @@ -17,15 +17,15 @@ namespace {
|
| DisplayInfoProvider* g_display_info_provider = NULL;
|
|
|
| // Converts Rotation enum to integer.
|
| -int RotationToDegrees(gfx::Display::Rotation rotation) {
|
| +int RotationToDegrees(display::Display::Rotation rotation) {
|
| switch (rotation) {
|
| - case gfx::Display::ROTATE_0:
|
| + case display::Display::ROTATE_0:
|
| return 0;
|
| - case gfx::Display::ROTATE_90:
|
| + case display::Display::ROTATE_90:
|
| return 90;
|
| - case gfx::Display::ROTATE_180:
|
| + case display::Display::ROTATE_180:
|
| return 180;
|
| - case gfx::Display::ROTATE_270:
|
| + case display::Display::ROTATE_270:
|
| return 270;
|
| }
|
| return 0;
|
| @@ -52,7 +52,7 @@ void DisplayInfoProvider::InitializeForTesting(
|
| // static
|
| // Creates new DisplayUnitInfo struct for |display|.
|
| api::system_display::DisplayUnitInfo DisplayInfoProvider::CreateDisplayUnitInfo(
|
| - const gfx::Display& display,
|
| + const display::Display& display,
|
| int64_t primary_display_id) {
|
| api::system_display::DisplayUnitInfo unit;
|
| const gfx::Rect& bounds = display.bounds();
|
| @@ -76,11 +76,11 @@ api::system_display::DisplayUnitInfo DisplayInfoProvider::CreateDisplayUnitInfo(
|
| void DisplayInfoProvider::EnableUnifiedDesktop(bool enable) {}
|
|
|
| DisplayUnitInfoList DisplayInfoProvider::GetAllDisplaysInfo() {
|
| - gfx::Screen* screen = gfx::Screen::GetScreen();
|
| + display::Screen* screen = display::Screen::GetScreen();
|
| int64_t primary_id = screen->GetPrimaryDisplay().id();
|
| - std::vector<gfx::Display> displays = screen->GetAllDisplays();
|
| + std::vector<display::Display> displays = screen->GetAllDisplays();
|
| DisplayUnitInfoList all_displays;
|
| - for (const gfx::Display& display : displays) {
|
| + for (const display::Display& display : displays) {
|
| api::system_display::DisplayUnitInfo unit =
|
| CreateDisplayUnitInfo(display, primary_id);
|
| UpdateDisplayUnitInfoForPlatform(display, &unit);
|
|
|