Make MediaPlayerEventRouter a PKS to decouple it from ExtensionService

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 "ash/shell.h"
 #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_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/screen.h"
 
+#if defined(FILE_MANAGER_EXTENSION)
+#include "chrome/browser/chromeos/extensions/media_player_api.h"
+#include "chrome/browser/chromeos/extensions/media_player_event_router.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
 
 const char kMediaPlayerAppName[] = "mediaplayer";
 const int kPopupRight = 20;
 const int kPopupBottom = 80;
 const int kPopupWidth = 280;
 
 // Set the initial height to the minimum possible height. Keep the constants
@@ skipping 68 matching lines @@
   EnqueueMediaFileUrl(url);
   SetPlaylistPosition(0);
   NotifyPlaylistChanged();
 }
 
 void MediaPlayer::SetPlaylistPosition(int position) {
   current_position_ = position;
 }
 
 void MediaPlayer::NotifyPlaylistChanged() {
-  ExtensionMediaPlayerEventRouter::GetInstance()->NotifyPlaylistChanged();
+#if defined(FILE_MANAGER_EXTENSION)
+  Browser* browser = GetBrowser();
+  if (browser) {
+    extensions::MediaPlayerAPI::Get(browser->profile())->
+        media_player_event_router()->NotifyPlaylistChanged();
+  } else {
+    // How do we handle this case??

[Yoyo Zhou, 2012/12/20 22:45:20]

Probably okay to let this notification drop on the floor. (Do nothing.)

[Joe Thomas, 2012/12/20 23:20:28]

Done.

+  }
+#endif
 }
 
 void MediaPlayer::PopupMediaPlayer() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&MediaPlayer::PopupMediaPlayer,
                    base::Unretained(this) /*this class is a singleton*/));
     return;
   }
@@ skipping 34 matching lines @@
       if (base_url == GetMediaPlayerUrl())
         return browser;
     }
   }
   return NULL;
 }
 
 MediaPlayer::MediaPlayer()
     : current_position_(0) {
 };