chrome/browser/chromeos/media/media_player.cc - Issue 7618048: Move the core download files to content.

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

Issue 7618048: Move the core download files to content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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

« chrome/browser/automation/automation_provider_observers.cc ('K') | « chrome/browser/browsing_data_remover.cc ('k') | chrome/browser/download/chrome_download_manager_delegate.cc » ('j') | chrome/browser/download/download_file_picker.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/memory/singleton.h"	9 #include "base/memory/singleton.h"

10 #include "base/memory/weak_ptr.h"	10 #include "base/memory/weak_ptr.h"

11 #include "base/message_loop.h"	11 #include "base/message_loop.h"

12 #include "base/path_service.h"	12 #include "base/path_service.h"

13 #include "base/string_piece.h"	13 #include "base/string_piece.h"

14 #include "base/string_util.h"	14 #include "base/string_util.h"

15 #include "base/threading/thread.h"	15 #include "base/threading/thread.h"

16 #include "base/time.h"	16 #include "base/time.h"

17 #include "base/values.h"	17 #include "base/values.h"

18 #include "chrome/browser/bookmarks/bookmark_model.h"	18 #include "chrome/browser/bookmarks/bookmark_model.h"

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

20 #include "chrome/browser/download/download_manager.h"

21 #include "chrome/browser/download/download_util.h"	20 #include "chrome/browser/download/download_util.h"

22 #include "chrome/browser/extensions/file_manager_util.h"	21 #include "chrome/browser/extensions/file_manager_util.h"

23 #include "chrome/browser/history/history_types.h"	22 #include "chrome/browser/history/history_types.h"

24 #include "chrome/browser/profiles/profile.h"	23 #include "chrome/browser/profiles/profile.h"

25 #include "chrome/browser/tabs/tab_strip_model.h"	24 #include "chrome/browser/tabs/tab_strip_model.h"

26 #include "chrome/browser/ui/browser.h"	25 #include "chrome/browser/ui/browser.h"

27 #include "chrome/browser/ui/browser_list.h"	26 #include "chrome/browser/ui/browser_list.h"

28 #include "chrome/browser/ui/browser_window.h"	27 #include "chrome/browser/ui/browser_window.h"

29 #include "chrome/browser/ui/webui/favicon_source.h"	28 #include "chrome/browser/ui/webui/favicon_source.h"

30 #include "chrome/common/chrome_notification_types.h"	29 #include "chrome/common/chrome_notification_types.h"

31 #include "chrome/common/chrome_paths.h"	30 #include "chrome/common/chrome_paths.h"

32 #include "chrome/common/chrome_switches.h"	31 #include "chrome/common/chrome_switches.h"

33 #include "chrome/common/jstemplate_builder.h"	32 #include "chrome/common/jstemplate_builder.h"

34 #include "chrome/common/time_format.h"	33 #include "chrome/common/time_format.h"

35 #include "chrome/common/url_constants.h"	34 #include "chrome/common/url_constants.h"

36 #include "content/browser/browser_thread.h"	35 #include "content/browser/browser_thread.h"

	36 #include "content/browser/download/download_manager.h"

37 #include "content/browser/tab_contents/tab_contents.h"	37 #include "content/browser/tab_contents/tab_contents.h"

38 #include "content/browser/user_metrics.h"	38 #include "content/browser/user_metrics.h"

39 #include "content/common/url_fetcher.h"	39 #include "content/common/url_fetcher.h"

40 #include "grit/browser_resources.h"	40 #include "grit/browser_resources.h"

41 #include "grit/chromium_strings.h"	41 #include "grit/chromium_strings.h"

42 #include "grit/generated_resources.h"	42 #include "grit/generated_resources.h"

43 #include "grit/locale_settings.h"	43 #include "grit/locale_settings.h"

44 #include "net/base/escape.h"	44 #include "net/base/escape.h"

45 #include "net/base/load_flags.h"	45 #include "net/base/load_flags.h"

46 #include "net/url_request/url_request_job.h"	46 #include "net/url_request/url_request_job.h"

(...skipping 256 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
303	303

304 MediaPlayer::MediaPlayer()	304 MediaPlayer::MediaPlayer()

305 : current_position_(0),	305 : current_position_(0),

306 pending_playback_request_(false),	306 pending_playback_request_(false),

307 playlist_browser_(NULL),	307 playlist_browser_(NULL),

308 mediaplayer_browser_(NULL) {	308 mediaplayer_browser_(NULL) {

309 for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) {	309 for (size_t i = 0; i < arraysize(supported_mime_type_list); ++i) {

310 supported_mime_types_.insert(supported_mime_type_list[i]);	310 supported_mime_types_.insert(supported_mime_type_list[i]);

311 }	311 }

312 };	312 };

OLD	NEW