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

ash/system/tray/system_tray.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/system/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 311 matching lines @@
   virtual gfx::Rect GetAnchorRect() OVERRIDE {
     views::Widget* widget = tray_->GetWidget();
     if (widget->IsVisible()) {
       gfx::Rect rect = widget->GetWindowScreenBounds();
       rect.Inset(
           base::i18n::IsRTL() ? kPaddingFromRightEdgeOfScreen : 0, 0,
           base::i18n::IsRTL() ? 0 : kPaddingFromRightEdgeOfScreen,
           kPaddingFromBottomOfScreen);
       return rect;
     }
-    gfx::Rect rect = gfx::Screen::GetPrimaryMonitorBounds();
+    gfx::Rect rect = gfx::Screen::GetPrimaryMonitor().bounds();
     return gfx::Rect(base::i18n::IsRTL() ? kPaddingFromRightEdgeOfScreen :
                         rect.width() - kPaddingFromRightEdgeOfScreen,
                      rect.height() - kPaddingFromBottomOfScreen,
                      0, 0);
   }
 
   // Overridden from views::View.
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
     if (can_activate_) {
       state->role = ui::AccessibilityTypes::ROLE_WINDOW;
@@ skipping 361 matching lines @@
       popup_->Hide();
     }
   }
   return base::EVENT_CONTINUE;
 }
 
 void SystemTray::DidProcessEvent(const base::NativeEvent& event) {
 }
 
 }  // namespace ash