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

Side by Side Diff: chrome/browser/ui/webui/chrome_web_ui_factory.cc

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Playlist doesn't reset pending playback request. Created 9 years, 7 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
OLDNEW
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/ui/webui/chrome_web_ui_factory.h" 5 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/about_flags.h" 8 #include "chrome/browser/about_flags.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_web_ui.h" 10 #include "chrome/browser/extensions/extension_web_ui.h"
(...skipping 28 matching lines...) Expand all
39 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" 39 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
40 #include "chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.h" 40 #include "chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.h"
41 #include "chrome/browser/ui/webui/chromeos/imageburner_ui.h" 41 #include "chrome/browser/ui/webui/chromeos/imageburner_ui.h"
42 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" 42 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
43 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h" 43 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
44 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" 44 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
45 #include "chrome/browser/ui/webui/chromeos/register_page_ui.h" 45 #include "chrome/browser/ui/webui/chromeos/register_page_ui.h"
46 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h" 46 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
47 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h" 47 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
48 #include "chrome/browser/ui/webui/active_downloads_ui.h" 48 #include "chrome/browser/ui/webui/active_downloads_ui.h"
49 #include "chrome/browser/ui/webui/mediaplayer_ui.h"
50 #endif 49 #endif
51 50
52 #if defined(TOUCH_UI) 51 #if defined(TOUCH_UI)
53 #include "chrome/browser/ui/webui/keyboard_ui.h" 52 #include "chrome/browser/ui/webui/keyboard_ui.h"
54 #endif 53 #endif
55 54
56 #if defined(TOUCH_UI) && defined(OS_CHROMEOS) 55 #if defined(TOUCH_UI) && defined(OS_CHROMEOS)
57 #include "chrome/browser/ui/webui/chromeos/login/login_ui.h" 56 #include "chrome/browser/ui/webui/chromeos/login/login_ui.h"
58 #endif 57 #endif
59 58
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 if (url.host() == chrome::kChromeUICollectedCookiesHost || 173 if (url.host() == chrome::kChromeUICollectedCookiesHost ||
175 url.host() == chrome::kChromeUIHttpAuthHost) { 174 url.host() == chrome::kChromeUIHttpAuthHost) {
176 return &NewWebUI<ConstrainedHtmlUI>; 175 return &NewWebUI<ConstrainedHtmlUI>;
177 } 176 }
178 if (url.host() == chrome::kChromeUIActiveDownloadsHost) 177 if (url.host() == chrome::kChromeUIActiveDownloadsHost)
179 return &NewWebUI<ActiveDownloadsUI>; 178 return &NewWebUI<ActiveDownloadsUI>;
180 if (url.host() == chrome::kChromeUIImageBurnerHost) 179 if (url.host() == chrome::kChromeUIImageBurnerHost)
181 return &NewWebUI<ImageBurnUI>; 180 return &NewWebUI<ImageBurnUI>;
182 if (url.host() == chrome::kChromeUIKeyboardOverlayHost) 181 if (url.host() == chrome::kChromeUIKeyboardOverlayHost)
183 return &NewWebUI<KeyboardOverlayUI>; 182 return &NewWebUI<KeyboardOverlayUI>;
184 if (url.host() == chrome::kChromeUIMediaplayerHost)
185 return &NewWebUI<MediaplayerUI>;
186 if (url.host() == chrome::kChromeUIMobileSetupHost) 183 if (url.host() == chrome::kChromeUIMobileSetupHost)
187 return &NewWebUI<MobileSetupUI>; 184 return &NewWebUI<MobileSetupUI>;
188 if (url.host() == chrome::kChromeUIProxySettingsHost) 185 if (url.host() == chrome::kChromeUIProxySettingsHost)
189 return &NewWebUI<chromeos::ProxySettingsUI>; 186 return &NewWebUI<chromeos::ProxySettingsUI>;
190 if (url.host() == chrome::kChromeUIRegisterPageHost) 187 if (url.host() == chrome::kChromeUIRegisterPageHost)
191 return &NewWebUI<RegisterPageUI>; 188 return &NewWebUI<RegisterPageUI>;
192 if (url.host() == chrome::kChromeUISettingsHost) 189 if (url.host() == chrome::kChromeUISettingsHost)
193 return &NewWebUI<OptionsUI>; 190 return &NewWebUI<OptionsUI>;
194 if (url.host() == chrome::kChromeUISimUnlockHost) 191 if (url.host() == chrome::kChromeUISimUnlockHost)
195 return &NewWebUI<chromeos::SimUnlockUI>; 192 return &NewWebUI<chromeos::SimUnlockUI>;
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 return FlagsUI::GetFaviconResourceBytes(); 332 return FlagsUI::GetFaviconResourceBytes();
336 333
337 if (page_url.host() == chrome::kChromeUISettingsHost) 334 if (page_url.host() == chrome::kChromeUISettingsHost)
338 return OptionsUI::GetFaviconResourceBytes(); 335 return OptionsUI::GetFaviconResourceBytes();
339 336
340 if (page_url.host() == chrome::kChromeUIPluginsHost) 337 if (page_url.host() == chrome::kChromeUIPluginsHost)
341 return PluginsUI::GetFaviconResourceBytes(); 338 return PluginsUI::GetFaviconResourceBytes();
342 339
343 return NULL; 340 return NULL;
344 } 341 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/active_downloads_ui.cc ('k') | chrome/browser/ui/webui/mediaplayer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698