diff options
| author | dhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 19:48:23 +0000 |
|---|---|---|
| committer | dhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 19:48:23 +0000 |
| commit | 17496bbed312152a6a0c2251c88ccefd70849540 (patch) | |
| tree | 03edf49985ed65b6e42d2385566d600fd88f2535 /chrome/browser/browser_init.cc | |
| parent | a0607da9446e3ec76a7ced32502f8c7e71654d53 (diff) | |
| download | chromium_src-17496bbed312152a6a0c2251c88ccefd70849540.zip chromium_src-17496bbed312152a6a0c2251c88ccefd70849540.tar.gz chromium_src-17496bbed312152a6a0c2251c88ccefd70849540.tar.bz2 | |
Adding initial version of the mediaplayer. This only hooks into the system if the user selects a file via the filebrowser.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/749001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 9f92ad8..8481acf 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -61,6 +61,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/browser_notification_observers.h" +#include "chrome/browser/dom_ui/mediaplayer_ui.h" #include "chrome/browser/chromeos/cros/mount_library.h" #include "chrome/browser/chromeos/gview_request_interceptor.h" #include "chrome/browser/chromeos/usb_mount_observer.h" @@ -386,6 +387,8 @@ bool BrowserInit::LaunchBrowser( // and have the constructor take care of everything else. chromeos::MountLibrary* lib = chromeos::MountLibrary::Get(); chromeos::USBMountObserver* observe = chromeos::USBMountObserver::Get(); + MediaPlayer* player = MediaPlayer::Get(); + player->set_profile(profile); observe->set_profile(profile); lib->AddObserver(observe); } |