Position the Chrome OS Audio Player properly.

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 "base/command_line.h"
@@ skipping 28 matching lines @@
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_job.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
 #endif
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 static const char* kMediaPlayerAppName = "mediaplayer";
-static const int kPopupLeft = 0;
-static const int kPopupTop = 0;
+static const int kPopupRight = 20;
+static const int kPopupBottom = 50;
 static const int kPopupWidth = 280;
 
 // Set the initial height to the minimum possible height. Keep the constants
 // in sync with chrome/browser/resources/file_manager/css/audio_player.css.
 // SetWindowHeight will be called soon after the popup creation with the correct
 // height which will cause a nice slide-up animation.
 // TODO(kaznacheev): Remove kTitleHeight when MediaPlayer becomes chromeless.
 static const int kTitleHeight = 24;
 static const int kTrackHeight = 58;
 static const int kControlsHeight = 35;
@@ skipping 14 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 MediaPlayer::~MediaPlayer() {
 }
 
 // static
 MediaPlayer* MediaPlayer::GetInstance() {
   return Singleton<MediaPlayer>::get();
 }
 
-void MediaPlayer::SetWindowHeight(int height) {
+void MediaPlayer::SetWindowHeight(int content_height) {
   if (mediaplayer_browser_ != NULL) {
-    mediaplayer_browser_->window()->SetBounds(gfx::Rect(kPopupLeft,
-                                                        kPopupTop,
-                                                        kPopupWidth,
-                                                        height + kTitleHeight));
+    int window_height = content_height + kTitleHeight;
+    gfx::Rect bounds = mediaplayer_browser_->window()->GetBounds();
+    mediaplayer_browser_->window()->SetBounds(gfx::Rect(
+        bounds.x(),
+        std::max(0, bounds.bottom() - window_height),
+        bounds.width(),
+        window_height));
   }
 }
 
 void MediaPlayer::CloseWindow() {
   if (mediaplayer_browser_ != NULL) {
     mediaplayer_browser_->window()->Close();
   }
 }
 
 void MediaPlayer::ClearPlaylist() {
@@ skipping 40 matching lines @@
 
 void MediaPlayer::PopupMediaPlayer(Browser* creator) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&MediaPlayer::PopupMediaPlayer,
                    base::Unretained(this),  // this class is a singleton.
                    static_cast<Browser*>(NULL)));
     return;
   }
-  if (mediaplayer_browser_)
-    return;  // Already opened.
+  if (mediaplayer_browser_) {  // Already opened.
+    mediaplayer_browser_->window()->Show();
+    return;
+  }
+
+  const gfx::Size screen = gfx::Screen::GetPrimaryMonitorSize();
+  const gfx::Rect bounds(screen.width() - kPopupRight - kPopupWidth,
+                         screen.height() - kPopupBottom - kPopupHeight,
+                         kPopupWidth,
+                         kPopupHeight);
 
   Profile* profile = BrowserList::GetLastActive()->profile();
   mediaplayer_browser_ = Browser::CreateForApp(Browser::TYPE_PANEL,
                                                kMediaPlayerAppName,
-                                               gfx::Rect(kPopupLeft,
-                                                         kPopupTop,
-                                                         kPopupWidth,
-                                                         kPopupHeight),
+                                               bounds,
                                                profile);
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_CLOSED,
                  content::Source<Browser>(mediaplayer_browser_));
 
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
   // Since we are on chromeos, popups should be a PanelBrowserView,
   // so we can just cast it.
   if (creator) {
     chromeos::PanelBrowserView* creatorview =
@@ skipping 51 matching lines @@
   return file_manager_util::GetMediaPlayerUrl();
 }
 
 MediaPlayer::MediaPlayer()
     : current_position_(0),
       mediaplayer_browser_(NULL) {
   for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) {
     supported_mime_types_.insert(supported_mime_type_list[i]);
   }
 };