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/tray/tray_constants.h"
@@ skipping 10 matching lines @@
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 312 matching lines @@
   }
 
   virtual gfx::Rect GetAnchorRect() OVERRIDE {
     views::Widget* widget = tray_->GetWidget();
     if (widget->IsVisible()) {
       gfx::Rect rect = widget->GetWindowScreenBounds();
       rect.Inset(0, 0, kPaddingFromRightEdgeOfScreen,
           kPaddingFromBottomOfScreen);
       return rect;
     }
-    gfx::Rect rect = gfx::Screen::GetPrimaryMonitorBounds();
+    gfx::Rect rect = gfx::Screen::GetPrimaryMonitor()->GetBounds();
     return gfx::Rect(rect.width() - kPaddingFromRightEdgeOfScreen,
                      rect.height() - kPaddingFromBottomOfScreen,
                      0, 0);
   }
 
   // Overridden from views::View.
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
     state->role = ui::AccessibilityTypes::ROLE_WINDOW;
     state->name = l10n_util::GetStringUTF16(
         IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME);
@@ skipping 302 matching lines @@
       popup_->Hide();
     }
   }
   return base::EVENT_CONTINUE;
 }
 
 void SystemTray::DidProcessEvent(const base::NativeEvent& event) {
 }
 
 }  // namespace ash