chrome/browser/dom_ui/mediaplayer_ui.cc - Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4].

Side by Side Diff: chrome/browser/dom_ui/mediaplayer_ui.cc

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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/dom_ui/mediaplayer_browsertest.cc ('k') | chrome/browser/dom_ui/new_tab_ui.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/dom_ui/mediaplayer_ui.h"	5 #include "chrome/browser/dom_ui/mediaplayer_ui.h"

6	6

7 #include "app/resource_bundle.h"	7 #include "app/resource_bundle.h"

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

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

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

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

12 #include "base/singleton.h"	12 #include "base/singleton.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/thread.h"	15 #include "base/thread.h"

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

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

18 #include "base/weak_ptr.h"	18 #include "base/weak_ptr.h"

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

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

21 #include "chrome/browser/browser_list.h"

22 #include "chrome/browser/browser_thread.h"	20 #include "chrome/browser/browser_thread.h"

23 #include "chrome/browser/browser_window.h"

24 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"	21 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"

25 #include "chrome/browser/download/download_manager.h"	22 #include "chrome/browser/download/download_manager.h"

26 #include "chrome/browser/download/download_util.h"	23 #include "chrome/browser/download/download_util.h"

	24 #include "chrome/browser/history/history_types.h"

27 #include "chrome/browser/metrics/user_metrics.h"	25 #include "chrome/browser/metrics/user_metrics.h"

28 #include "chrome/browser/history/history_types.h"

29 #include "chrome/browser/profile.h"	26 #include "chrome/browser/profile.h"

30 #include "chrome/browser/tab_contents/tab_contents.h"	27 #include "chrome/browser/tab_contents/tab_contents.h"

31 #include "chrome/browser/tabs/tab_strip_model.h"	28 #include "chrome/browser/tabs/tab_strip_model.h"

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

	30 #include "chrome/browser/ui/browser_list.h"

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

32 #include "chrome/common/chrome_paths.h"	32 #include "chrome/common/chrome_paths.h"

33 #include "chrome/common/chrome_switches.h"	33 #include "chrome/common/chrome_switches.h"

34 #include "chrome/common/jstemplate_builder.h"	34 #include "chrome/common/jstemplate_builder.h"

35 #include "chrome/common/net/url_fetcher.h"	35 #include "chrome/common/net/url_fetcher.h"

36 #include "chrome/common/time_format.h"	36 #include "chrome/common/time_format.h"

37 #include "chrome/common/url_constants.h"	37 #include "chrome/common/url_constants.h"

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

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

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

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

(...skipping 565 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
607 new MediaplayerUIHTMLSource(is_playlist);	607 new MediaplayerUIHTMLSource(is_playlist);

608	608

609 // Set up the chrome://mediaplayer/ source.	609 // Set up the chrome://mediaplayer/ source.

610 BrowserThread::PostTask(	610 BrowserThread::PostTask(

611 BrowserThread::IO, FROM_HERE,	611 BrowserThread::IO, FROM_HERE,

612 NewRunnableMethod(	612 NewRunnableMethod(

613 Singleton<ChromeURLDataManager>::get(),	613 Singleton<ChromeURLDataManager>::get(),

614 &ChromeURLDataManager::AddDataSource,	614 &ChromeURLDataManager::AddDataSource,

615 make_scoped_refptr(html_source)));	615 make_scoped_refptr(html_source)));

616 }	616 }

OLD	NEW