chrome/browser/chromeos/media/media_player.cc - Issue 13779002: chromeos: Add a subdirectory "file_manager" to chrome/browser/chromeos/extensions

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/media/media_player.cc

Issue 13779002: chromeos: Add a subdirectory "file_manager" to chrome/browser/chromeos/extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager_util.cc ('k') | chrome/browser/platform_util_chromeos.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/chromeos/media/media_player.h"	5 #include "chrome/browser/chromeos/media/media_player.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "chrome/browser/chromeos/extensions/file_manager_util.h"	11 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"

12 #include "chrome/browser/chromeos/extensions/media_player_api.h"	12 #include "chrome/browser/chromeos/extensions/media_player_api.h"

13 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"	13 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/profiles/profile_manager.h"	15 #include "chrome/browser/profiles/profile_manager.h"

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_iterator.h"	17 #include "chrome/browser/ui/browser_iterator.h"

18 #include "chrome/browser/ui/browser_tabstrip.h"	18 #include "chrome/browser/ui/browser_tabstrip.h"

19 #include "chrome/browser/ui/browser_window.h"	19 #include "chrome/browser/ui/browser_window.h"

20 #include "chrome/browser/ui/host_desktop.h"	20 #include "chrome/browser/ui/host_desktop.h"

21 #include "chrome/browser/ui/tabs/tab_strip_model.h"	21 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 142 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164 if (base_url == GetMediaPlayerUrl())	164 if (base_url == GetMediaPlayerUrl())

165 return browser;	165 return browser;

166 }	166 }

167 }	167 }

168 return NULL;	168 return NULL;

169 }	169 }

170	170

171 MediaPlayer::MediaPlayer()	171 MediaPlayer::MediaPlayer()

172 : current_position_(0) {	172 : current_position_(0) {

173 };	173 };

OLD	NEW