Refactor screen/monitor so that gfx::Screen returns monitor object.

ash/app_list/app_list_view.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/app_list/app_list_view.h"
 
 #include "ash/app_list/app_list_item_view.h"
 #include "ash/app_list/app_list_model.h"
 #include "ash/app_list/app_list_model_view.h"
 #include "ash/app_list/app_list_view_delegate.h"
@@ skipping 106 matching lines @@
 }
 
 void AppListView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   // Gets work area rect, which is in screen coordinates.
   gfx::Rect workarea = Shell::GetInstance()->shelf()->IsVisible() ?
       ScreenAsh::GetUnmaximizedWorkAreaBounds(GetWidget()->GetNativeView()) :
-      gfx::Screen::GetMonitorWorkAreaNearestWindow(
-          GetWidget()->GetNativeView());
+      gfx::Screen::GetMonitorNearestWindow(
+          GetWidget()->GetNativeView()).work_area();
 
   // Converts |workarea| into view's coordinates.
   gfx::Point origin(workarea.origin());
   views::View::ConvertPointFromScreen(this, &origin);
   workarea.Offset(-origin.x(), -origin.y());
 
   rect = rect.Intersect(workarea);
   model_view_->SetBoundsRect(rect);
 }
 
@@ skipping 20 matching lines @@
 
   if (delegate_.get()) {
     delegate_->OnAppListItemActivated(
         static_cast<AppListItemView*>(sender)->model(),
         event.flags());
   }
   Close();
 }
 
 }  // namespace ash