| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index ab3324040c09a6c170fd30299f654c1afdce61dd..3d245a3eae29006362e0a0ee19c21674cec30a53 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();
|
| @@ -908,7 +903,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));
|
|
|