| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/screen_ash.h" | 5 #include "ash/screen_ash.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/wm/shelf_layout_manager.h" | 8 #include "ash/wm/shelf_layout_manager.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 | 60 |
| 61 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const { | 61 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const { |
| 62 return GetMonitorManager()->GetDisplayNearestWindow(window); | 62 return GetMonitorManager()->GetDisplayNearestWindow(window); |
| 63 } | 63 } |
| 64 | 64 |
| 65 gfx::Display ScreenAsh::GetDisplayNearestPoint(const gfx::Point& point) const { | 65 gfx::Display ScreenAsh::GetDisplayNearestPoint(const gfx::Point& point) const { |
| 66 return GetMonitorManager()->GetDisplayNearestPoint(point); | 66 return GetMonitorManager()->GetDisplayNearestPoint(point); |
| 67 } | 67 } |
| 68 | 68 |
| 69 gfx::Display ScreenAsh::GetPrimaryDisplay() const { | 69 gfx::Display ScreenAsh::GetPrimaryDisplay() const { |
| 70 return GetMonitorManager()->GetDisplayAt(0); | 70 return *GetMonitorManager()->GetDisplayAt(0); |
| 71 } | 71 } |
| 72 | 72 |
| 73 } // namespace ash | 73 } // namespace ash |
| OLD | NEW |