diff options
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index b8c2ef0..dfce306f 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -185,7 +185,8 @@ Shell::Shell(ShellDelegate* delegate) new internal::OutputConfiguratorAnimation()), #endif // defined(OS_CHROMEOS) browser_context_(NULL) { - gfx::Screen::SetInstance(screen_); + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_); + gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_); ui_controls::InstallUIControlsAura(internal::CreateUIControls()); #if defined(OS_CHROMEOS) output_configurator_->AddObserver(output_configurator_animation_.get()); @@ -313,6 +314,11 @@ aura::RootWindow* Shell::GetActiveRootWindow() { } // static +gfx::Screen* Shell::GetScreen() { + return gfx::Screen::GetScreenFor(GetPrimaryRootWindow()); +} + +// static Shell::RootWindowList Shell::GetAllRootWindows() { return Shell::GetInstance()->display_controller()-> GetAllRootWindows(); |