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

chrome/browser/ui/views/keyboard_overlay_delegate.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 "chrome/browser/ui/views/keyboard_overlay_delegate.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
@@ skipping 39 matching lines @@
 }
 
 void KeyboardOverlayDelegate::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
 }
 
 void KeyboardOverlayDelegate::GetDialogSize(
     gfx::Size* size) const {
   using std::min;
   DCHECK(view_);
-  gfx::Rect rect = gfx::Screen::GetMonitorAreaNearestWindow(
-      view_->GetWidget()->GetNativeView());
+  gfx::Rect rect = gfx::Screen::GetMonitorNearestWindow(
+      view_->GetWidget()->GetNativeView()).bounds();
   const int width = min(kBaseWidth, rect.width() - kHorizontalMargin);
   const int height = width * kBaseHeight / kBaseWidth;
   size->SetSize(width, height);
 }
 
 std::string KeyboardOverlayDelegate::GetDialogArgs() const {
   return "[]";
 }
 
 void KeyboardOverlayDelegate::OnDialogClosed(
     const std::string& json_retval) {
   // Re-enable Shift+Alt. crosbug.com/17208.
   chromeos::input_method::InputMethodManager::GetInstance()->EnableHotkeys();
   delete this;
   return;
 }
 
 void KeyboardOverlayDelegate::OnCloseContents(WebContents* source,
                                               bool* out_close_dialog) {
 }
 
 bool KeyboardOverlayDelegate::ShouldShowDialogTitle() const {
   return false;
 }
 
 bool KeyboardOverlayDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   return true;
 }