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

chrome/browser/chromeos/media/media_player.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/chromeos/media/media_player.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "net/url_request/url_request_job.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 static const char* kMediaPlayerAppName = "mediaplayer";
 static const int kPopupRight = 20;
 static const int kPopupBottom = 50;
 static const int kPopupWidth = 280;
 
@@ skipping 96 matching lines @@
         base::Bind(&MediaPlayer::PopupMediaPlayer,
                    base::Unretained(this),  // this class is a singleton.
                    static_cast<Browser*>(NULL)));
     return;
   }
   if (mediaplayer_browser_) {  // Already opened.
     mediaplayer_browser_->window()->Show();
     return;
   }
 
-  const gfx::Size screen = gfx::Screen::GetPrimaryMonitorSize();
+  const gfx::Size screen = gfx::Screen::GetPrimaryMonitor()->GetSize();
   const gfx::Rect bounds(screen.width() - kPopupRight - kPopupWidth,
                          screen.height() - kPopupBottom - kPopupHeight,
                          kPopupWidth,
                          kPopupHeight);
 
   Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
   mediaplayer_browser_ = Browser::CreateWithParams(
       Browser::CreateParams::CreateForApp(Browser::TYPE_PANEL,
                                           kMediaPlayerAppName,
                                           bounds,
@@ skipping 12 matching lines @@
 }
 
 GURL MediaPlayer::GetMediaPlayerUrl() const {
   return file_manager_util::GetMediaPlayerUrl();
 }
 
 MediaPlayer::MediaPlayer()
     : current_position_(0),
       mediaplayer_browser_(NULL) {
 };