Commit cd467a44 authored by serya@chromium.org's avatar serya@chromium.org

Fixed playing multiple files in the mediaplayer.

BUG=chromium-os:17610, chromium-os:18965
TEST=None


Review URL: http://codereview.chromium.org/7529048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97126 0039d316-1c4b-4281-b951-d872f2087c98
parent a850914e
...@@ -118,6 +118,7 @@ void MediaPlayer::ForcePlayMediaURL(const GURL& url, Browser* creator) { ...@@ -118,6 +118,7 @@ void MediaPlayer::ForcePlayMediaURL(const GURL& url, Browser* creator) {
if (mediaplayer_browser_ == NULL) { if (mediaplayer_browser_ == NULL) {
PopupMediaPlayer(creator); PopupMediaPlayer(creator);
} }
current_playlist_.clear();
current_playlist_.push_back(MediaUrl(url)); current_playlist_.push_back(MediaUrl(url));
current_position_ = current_playlist_.size() - 1; current_position_ = current_playlist_.size() - 1;
pending_playback_request_ = true; pending_playback_request_ = true;
......
...@@ -1054,7 +1054,9 @@ void ViewFilesFunction::GetLocalPathsResponseOnUIThread( ...@@ -1054,7 +1054,9 @@ void ViewFilesFunction::GetLocalPathsResponseOnUIThread(
iter != files.end(); iter != files.end();
++iter) { ++iter) {
FileManagerUtil::ViewItem(*iter, FileManagerUtil::ViewItem(*iter,
*(internal_task_id.get()) == kEnqueueTaskId); *(internal_task_id.get()) == kEnqueueTaskId ||
// Start the first one, enqueue others.
iter != files.begin());
} }
SendResponse(true); SendResponse(true);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment