Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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
OLDNEW
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/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/singleton.h" 11 #include "base/singleton.h"
12 #include "base/string_piece.h" 12 #include "base/string_piece.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/thread.h" 14 #include "base/thread.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "base/weak_ptr.h" 17 #include "base/weak_ptr.h"
18 #include "chrome/browser/bookmarks/bookmark_model.h" 18 #include "chrome/browser/bookmarks/bookmark_model.h"
19 #include "chrome/browser/browser.h" 19 #include "chrome/browser/browser.h"
20 #include "chrome/browser/browser_list.h" 20 #include "chrome/browser/browser_list.h"
21 #include "chrome/browser/browser_window.h" 21 #include "chrome/browser/browser_window.h"
22 #include "chrome/browser/chrome_thread.h" 22 #include "chrome/browser/chrome_thread.h"
23 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" 23 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
24 #include "chrome/browser/download/download_manager.h" 24 #include "chrome/browser/download/download_manager.h"
25 #include "chrome/browser/download/download_util.h" 25 #include "chrome/browser/download/download_util.h"
26 #include "chrome/browser/metrics/user_metrics.h" 26 #include "chrome/browser/metrics/user_metrics.h"
27 #include "chrome/browser/history/history_types.h" 27 #include "chrome/browser/history/history_types.h"
28 #include "chrome/browser/pref_service.h" 28 #include "chrome/browser/prefs/pref_service.h"
29 #include "chrome/browser/profile.h" 29 #include "chrome/browser/profile.h"
30 #include "chrome/browser/tab_contents/tab_contents.h" 30 #include "chrome/browser/tab_contents/tab_contents.h"
31 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/jstemplate_builder.h" 32 #include "chrome/common/jstemplate_builder.h"
33 #include "chrome/common/net/url_fetcher.h" 33 #include "chrome/common/net/url_fetcher.h"
34 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
35 #include "chrome/common/time_format.h" 35 #include "chrome/common/time_format.h"
36 #include "chrome/common/url_constants.h" 36 #include "chrome/common/url_constants.h"
37 #include "net/base/escape.h" 37 #include "net/base/escape.h"
38 #include "net/base/load_flags.h" 38 #include "net/base/load_flags.h"
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 new MediaplayerUIHTMLSource(is_playlist); 609 new MediaplayerUIHTMLSource(is_playlist);
610 610
611 // Set up the chrome://mediaplayer/ source. 611 // Set up the chrome://mediaplayer/ source.
612 ChromeThread::PostTask( 612 ChromeThread::PostTask(
613 ChromeThread::IO, FROM_HERE, 613 ChromeThread::IO, FROM_HERE,
614 NewRunnableMethod( 614 NewRunnableMethod(
615 Singleton<ChromeURLDataManager>::get(), 615 Singleton<ChromeURLDataManager>::get(),
616 &ChromeURLDataManager::AddDataSource, 616 &ChromeURLDataManager::AddDataSource,
617 make_scoped_refptr(html_source))); 617 make_scoped_refptr(html_source)));
618 } 618 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698