| Index: ash/display/screen_ash.cc
|
| diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
|
| index d3bdd609fa0100d198ad9f42c7a44f0a96422612..271b8e6283dc2690bfa1d1dd2321c36bede48083 100644
|
| --- a/ash/display/screen_ash.cc
|
| +++ b/ash/display/screen_ash.cc
|
| @@ -113,65 +113,6 @@ ScreenAsh::ScreenAsh() {
|
| ScreenAsh::~ScreenAsh() {
|
| }
|
|
|
| -// static
|
| -gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) {
|
| - return GetDisplayManager()->FindDisplayContainingPoint(point);
|
| -}
|
| -
|
| -// static
|
| -gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
|
| - if (GetRootWindowController(window->GetRootWindow())->shelf())
|
| - return GetDisplayWorkAreaBoundsInParent(window);
|
| - else
|
| - return GetDisplayBoundsInParent(window);
|
| -}
|
| -
|
| -// static
|
| -gfx::Rect ScreenAsh::GetDisplayBoundsInParent(aura::Window* window) {
|
| - return ConvertRectFromScreen(
|
| - window->parent(),
|
| - Shell::GetScreen()->GetDisplayNearestWindow(window).bounds());
|
| -}
|
| -
|
| -// static
|
| -gfx::Rect ScreenAsh::GetDisplayWorkAreaBoundsInParent(aura::Window* window) {
|
| - return ConvertRectFromScreen(
|
| - window->parent(),
|
| - Shell::GetScreen()->GetDisplayNearestWindow(window).work_area());
|
| -}
|
| -
|
| -// static
|
| -gfx::Rect ScreenAsh::ConvertRectToScreen(aura::Window* window,
|
| - const gfx::Rect& rect) {
|
| - gfx::Point point = rect.origin();
|
| - aura::client::GetScreenPositionClient(window->GetRootWindow())->
|
| - ConvertPointToScreen(window, &point);
|
| - return gfx::Rect(point, rect.size());
|
| -}
|
| -
|
| -// static
|
| -gfx::Rect ScreenAsh::ConvertRectFromScreen(aura::Window* window,
|
| - const gfx::Rect& rect) {
|
| - gfx::Point point = rect.origin();
|
| - aura::client::GetScreenPositionClient(window->GetRootWindow())->
|
| - ConvertPointFromScreen(window, &point);
|
| - return gfx::Rect(point, rect.size());
|
| -}
|
| -
|
| -// static
|
| -const gfx::Display& ScreenAsh::GetSecondaryDisplay() {
|
| - DisplayManager* display_manager = GetDisplayManager();
|
| - CHECK_EQ(2U, display_manager->GetNumDisplays());
|
| - return display_manager->GetDisplayAt(0).id() ==
|
| - Shell::GetScreen()->GetPrimaryDisplay().id() ?
|
| - display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0);
|
| -}
|
| -
|
| -// static
|
| -const gfx::Display& ScreenAsh::GetDisplayForId(int64 display_id) {
|
| - return GetDisplayManager()->GetDisplayForId(display_id);
|
| -}
|
| -
|
| void ScreenAsh::NotifyMetricsChanged(const gfx::Display& display,
|
| uint32_t metrics) {
|
| FOR_EACH_OBSERVER(gfx::DisplayObserver,
|
|
|