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

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: Resolved conflicts. 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 29 matching lines...) Expand all
40 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" 40 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
41 #include "chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.h" 41 #include "chrome/browser/ui/webui/chromeos/enterprise_enrollment_ui.h"
42 #include "chrome/browser/ui/webui/chromeos/imageburner_ui.h" 42 #include "chrome/browser/ui/webui/chromeos/imageburner_ui.h"
43 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" 43 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
44 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h" 44 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
45 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h" 45 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
46 #include "chrome/browser/ui/webui/chromeos/register_page_ui.h" 46 #include "chrome/browser/ui/webui/chromeos/register_page_ui.h"
47 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h" 47 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
48 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h" 48 #include "chrome/browser/ui/webui/chromeos/system_info_ui.h"
49 #include "chrome/browser/ui/webui/active_downloads_ui.h" 49 #include "chrome/browser/ui/webui/active_downloads_ui.h"
50 #include "chrome/browser/ui/webui/mediaplayer_ui.h"
51 #endif 50 #endif
52 51
53 #if defined(TOUCH_UI) 52 #if defined(TOUCH_UI)
54 #include "chrome/browser/ui/webui/keyboard_ui.h" 53 #include "chrome/browser/ui/webui/keyboard_ui.h"
55 #endif 54 #endif
56 55
57 #if defined(TOUCH_UI) && defined(OS_CHROMEOS) 56 #if defined(TOUCH_UI) && defined(OS_CHROMEOS)
58 #include "chrome/browser/ui/webui/chromeos/login/login_ui.h" 57 #include "chrome/browser/ui/webui/chromeos/login/login_ui.h"
59 #endif 58 #endif
60 59
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 if (url.host() == chrome::kChromeUICollectedCookiesHost || 174 if (url.host() == chrome::kChromeUICollectedCookiesHost ||
176 url.host() == chrome::kChromeUIHttpAuthHost) { 175 url.host() == chrome::kChromeUIHttpAuthHost) {
177 return &NewWebUI<ConstrainedHtmlUI>; 176 return &NewWebUI<ConstrainedHtmlUI>;
178 } 177 }
179 if (url.host() == chrome::kChromeUIActiveDownloadsHost) 178 if (url.host() == chrome::kChromeUIActiveDownloadsHost)
180 return &NewWebUI<ActiveDownloadsUI>; 179 return &NewWebUI<ActiveDownloadsUI>;
181 if (url.host() == chrome::kChromeUIImageBurnerHost) 180 if (url.host() == chrome::kChromeUIImageBurnerHost)
182 return &NewWebUI<ImageBurnUI>; 181 return &NewWebUI<ImageBurnUI>;
183 if (url.host() == chrome::kChromeUIKeyboardOverlayHost) 182 if (url.host() == chrome::kChromeUIKeyboardOverlayHost)
184 return &NewWebUI<KeyboardOverlayUI>; 183 return &NewWebUI<KeyboardOverlayUI>;
185 if (url.host() == chrome::kChromeUIMediaplayerHost)
186 return &NewWebUI<MediaplayerUI>;
187 if (url.host() == chrome::kChromeUIMobileSetupHost) 184 if (url.host() == chrome::kChromeUIMobileSetupHost)
188 return &NewWebUI<MobileSetupUI>; 185 return &NewWebUI<MobileSetupUI>;
189 if (url.host() == chrome::kChromeUIProxySettingsHost) 186 if (url.host() == chrome::kChromeUIProxySettingsHost)
190 return &NewWebUI<chromeos::ProxySettingsUI>; 187 return &NewWebUI<chromeos::ProxySettingsUI>;
191 if (url.host() == chrome::kChromeUIRegisterPageHost) 188 if (url.host() == chrome::kChromeUIRegisterPageHost)
192 return &NewWebUI<RegisterPageUI>; 189 return &NewWebUI<RegisterPageUI>;
193 if (url.host() == chrome::kChromeUISettingsHost) 190 if (url.host() == chrome::kChromeUISettingsHost)
194 return &NewWebUI<OptionsUI>; 191 return &NewWebUI<OptionsUI>;
195 if (url.host() == chrome::kChromeUISimUnlockHost) 192 if (url.host() == chrome::kChromeUISimUnlockHost)
196 return &NewWebUI<chromeos::SimUnlockUI>; 193 return &NewWebUI<chromeos::SimUnlockUI>;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 return FlagsUI::GetFaviconResourceBytes(); 348 return FlagsUI::GetFaviconResourceBytes();
352 349
353 if (page_url.host() == chrome::kChromeUISettingsHost) 350 if (page_url.host() == chrome::kChromeUISettingsHost)
354 return OptionsUI::GetFaviconResourceBytes(); 351 return OptionsUI::GetFaviconResourceBytes();
355 352
356 if (page_url.host() == chrome::kChromeUIPluginsHost) 353 if (page_url.host() == chrome::kChromeUIPluginsHost)
357 return PluginsUI::GetFaviconResourceBytes(); 354 return PluginsUI::GetFaviconResourceBytes();
358 355
359 return NULL; 356 return NULL;
360 } 357 }
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