Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index f31c36d7a0a04674c2edf726cd2a6ee5ebf4026b..391a935a8837c75d3b98443b921d419a398139e2 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -242,11 +242,6 @@ aura::Window* Shell::GetTargetRootWindow() { |
} |
// static |
-gfx::Screen* Shell::GetScreen() { |
- return gfx::Screen::GetScreen(); |
-} |
- |
-// static |
aura::Window::Windows Shell::GetAllRootWindows() { |
CHECK(HasInstance()); |
return Shell::GetInstance()->window_tree_host_manager()->GetAllRootWindows(); |
@@ -910,7 +905,7 @@ void Shell::Init(const ShellInitParams& init_params) { |
new ResolutionNotificationController); |
#endif |
- cursor_manager_.SetDisplay(GetScreen()->GetPrimaryDisplay()); |
+ cursor_manager_.SetDisplay(gfx::Screen::GetScreen()->GetPrimaryDisplay()); |
nested_accelerator_controller_.reset( |
new ::wm::NestedAcceleratorController(new NestedAcceleratorDelegate)); |