Add context to gfx::Screen calls in support of simultaneous desktop+ash

ash/wm/workspace/workspace_event_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace/workspace_event_handler.h"
 
 #include "ash/screen_ash.h"
+#include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_window_resizer.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_functions.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
@@ skipping 116 matching lines @@
 }
 
 void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
     aura::Window* target,
     ui::MouseEvent* event) {
   if (event->flags() & ui::EF_IS_DOUBLE_CLICK &&
       !wm::IsWindowMaximized(target)) {
     int component =
         target->delegate()->GetNonClientComponent(event->location());
     gfx::Rect work_area =
-        gfx::Screen::GetDisplayNearestWindow(target).work_area();
+        Shell::GetScreen()->GetDisplayNearestWindow(target).work_area();
     const gfx::Rect* restore_bounds =
         target->GetProperty(aura::client::kRestoreBoundsKey);
     if (component == HTBOTTOM || component == HTTOP) {
       if (restore_bounds &&
           (target->bounds().height() == work_area.height() &&
            target->bounds().y() == work_area.y())) {
         SingleAxisUnmaximize(target, *restore_bounds);
       } else {
         SingleAxisMaximize(target,
                            gfx::Rect(target->bounds().x(),
@@ skipping 12 matching lines @@
                                      target->bounds().y(),
                                      work_area.width(),
                                      target->bounds().height()));
       }
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash