diff options
Diffstat (limited to 'extensions/shell')
-rw-r--r-- | extensions/shell/browser/shell_desktop_controller_aura.cc | 5 | ||||
-rw-r--r-- | extensions/shell/browser/shell_desktop_controller_mac.mm | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc index 9fc1876..18474de 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura.cc +++ b/extensions/shell/browser/shell_desktop_controller_aura.cc @@ -269,8 +269,7 @@ void ShellDesktopControllerAura::InitWindowManager() { cursor_manager_.reset( new wm::CursorManager(scoped_ptr<wm::NativeCursorManager>( new ShellNativeCursorManager(host_.get())))); - cursor_manager_->SetDisplay( - gfx::Screen::GetNativeScreen()->GetPrimaryDisplay()); + cursor_manager_->SetDisplay(gfx::Screen::GetScreen()->GetPrimaryDisplay()); cursor_manager_->SetCursor(ui::kCursorPointer); aura::client::SetCursorClient(host_->window(), cursor_manager_.get()); @@ -298,7 +297,7 @@ void ShellDesktopControllerAura::CreateRootWindow() { size = gfx::Size(1920, 1080); screen_.reset(new ShellScreen(size)); - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); + gfx::Screen::SetScreenInstance(screen_.get()); // TODO(mukai): Set up input method. host_.reset(screen_->CreateHostForPrimaryDisplay()); diff --git a/extensions/shell/browser/shell_desktop_controller_mac.mm b/extensions/shell/browser/shell_desktop_controller_mac.mm index 9789787..7731b0a 100644 --- a/extensions/shell/browser/shell_desktop_controller_mac.mm +++ b/extensions/shell/browser/shell_desktop_controller_mac.mm @@ -26,7 +26,7 @@ ShellDesktopControllerMac::~ShellDesktopControllerMac() { gfx::Size ShellDesktopControllerMac::GetWindowSize() { // This is the full screen size. - return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds().size(); + return gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds().size(); } AppWindow* ShellDesktopControllerMac::CreateAppWindow( |