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

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

Issue 1181703008: Removed webui_generator and new OOBE UI placeholder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed empty line. Created 5 years, 6 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_controller_factory.h" 5 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "components/favicon_base/favicon_util.h" 62 #include "components/favicon_base/favicon_util.h"
63 #include "components/favicon_base/select_favicon_frames.h" 63 #include "components/favicon_base/select_favicon_frames.h"
64 #include "components/history/core/browser/history_types.h" 64 #include "components/history/core/browser/history_types.h"
65 #include "components/password_manager/core/common/password_manager_switches.h" 65 #include "components/password_manager/core/common/password_manager_switches.h"
66 #include "components/signin/core/common/profile_management_switches.h" 66 #include "components/signin/core/common/profile_management_switches.h"
67 #include "content/public/browser/web_contents.h" 67 #include "content/public/browser/web_contents.h"
68 #include "content/public/browser/web_ui.h" 68 #include "content/public/browser/web_ui.h"
69 #include "content/public/common/content_client.h" 69 #include "content/public/common/content_client.h"
70 #include "content/public/common/url_utils.h" 70 #include "content/public/common/url_utils.h"
71 #include "ui/gfx/favicon_size.h" 71 #include "ui/gfx/favicon_size.h"
72 #include "ui/oobe/oobe_md_ui.h"
73 #include "ui/web_dialogs/web_dialog_ui.h" 72 #include "ui/web_dialogs/web_dialog_ui.h"
74 #include "url/gurl.h" 73 #include "url/gurl.h"
75 74
76 #if !defined(DISABLE_NACL) 75 #if !defined(DISABLE_NACL)
77 #include "chrome/browser/ui/webui/nacl_ui.h" 76 #include "chrome/browser/ui/webui/nacl_ui.h"
78 #endif 77 #endif
79 78
80 #if defined(ENABLE_CONFIGURATION_POLICY) 79 #if defined(ENABLE_CONFIGURATION_POLICY)
81 #include "chrome/browser/ui/webui/policy_ui.h" 80 #include "chrome/browser/ui/webui/policy_ui.h"
82 #endif 81 #endif
(...skipping 25 matching lines...) Expand all
108 #include "chrome/browser/signin/easy_unlock_service.h" 107 #include "chrome/browser/signin/easy_unlock_service.h"
109 #include "chrome/browser/signin/easy_unlock_service_factory.h" 108 #include "chrome/browser/signin/easy_unlock_service_factory.h"
110 #include "chrome/browser/ui/webui/copresence_ui.h" 109 #include "chrome/browser/ui/webui/copresence_ui.h"
111 #include "chrome/browser/ui/webui/devtools_ui.h" 110 #include "chrome/browser/ui/webui/devtools_ui.h"
112 #include "chrome/browser/ui/webui/inspect_ui.h" 111 #include "chrome/browser/ui/webui/inspect_ui.h"
113 #include "components/proximity_auth/webui/proximity_auth_ui.h" 112 #include "components/proximity_auth/webui/proximity_auth_ui.h"
114 #include "components/proximity_auth/webui/url_constants.h" 113 #include "components/proximity_auth/webui/url_constants.h"
115 #endif 114 #endif
116 115
117 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
118 #include "chrome/browser/chromeos/oobe/oobe.h"
119 #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h" 117 #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h"
120 #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h" 118 #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h"
121 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" 119 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
122 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h" 120 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h"
123 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h" 121 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"
124 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h" 122 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
125 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h" 123 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
126 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" 124 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
127 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 125 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
128 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h" 126 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 template<> 209 template<>
212 WebUIController* NewWebUI<AboutUI>(WebUI* web_ui, const GURL& url) { 210 WebUIController* NewWebUI<AboutUI>(WebUI* web_ui, const GURL& url) {
213 return new AboutUI(web_ui, url.host()); 211 return new AboutUI(web_ui, url.host());
214 } 212 }
215 213
216 #if defined(OS_CHROMEOS) 214 #if defined(OS_CHROMEOS)
217 template<> 215 template<>
218 WebUIController* NewWebUI<chromeos::OobeUI>(WebUI* web_ui, const GURL& url) { 216 WebUIController* NewWebUI<chromeos::OobeUI>(WebUI* web_ui, const GURL& url) {
219 return new chromeos::OobeUI(web_ui, url); 217 return new chromeos::OobeUI(web_ui, url);
220 } 218 }
221
222 template <>
223 WebUIController* NewWebUI<OobeMdUI>(WebUI* web_ui, const GURL& url) {
224 chromeos::Oobe::Register();
225 return new OobeMdUI(web_ui, url.host());
226 }
227 #endif 219 #endif
228 220
229 #if !defined(OS_ANDROID) && !defined(OS_IOS) 221 #if !defined(OS_ANDROID) && !defined(OS_IOS)
230 // Special case for chrome://proximity_auth. 222 // Special case for chrome://proximity_auth.
231 template <> 223 template <>
232 WebUIController* NewWebUI<proximity_auth::ProximityAuthUI>(WebUI* web_ui, 224 WebUIController* NewWebUI<proximity_auth::ProximityAuthUI>(WebUI* web_ui,
233 const GURL& url) { 225 const GURL& url) {
234 content::BrowserContext* browser_context = 226 content::BrowserContext* browser_context =
235 web_ui->GetWebContents()->GetBrowserContext(); 227 web_ui->GetWebContents()->GetBrowserContext();
236 return new proximity_auth::ProximityAuthUI( 228 return new proximity_auth::ProximityAuthUI(
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 if (url.host() == chrome::kChromeUIKeyboardOverlayHost) 446 if (url.host() == chrome::kChromeUIKeyboardOverlayHost)
455 return &NewWebUI<KeyboardOverlayUI>; 447 return &NewWebUI<KeyboardOverlayUI>;
456 if (url.host() == chrome::kChromeUIMobileSetupHost) 448 if (url.host() == chrome::kChromeUIMobileSetupHost)
457 return &NewWebUI<MobileSetupUI>; 449 return &NewWebUI<MobileSetupUI>;
458 if (url.host() == chrome::kChromeUINetworkHost) 450 if (url.host() == chrome::kChromeUINetworkHost)
459 return &NewWebUI<chromeos::NetworkUI>; 451 return &NewWebUI<chromeos::NetworkUI>;
460 if (url.host() == chrome::kChromeUINfcDebugHost) 452 if (url.host() == chrome::kChromeUINfcDebugHost)
461 return &NewWebUI<chromeos::NfcDebugUI>; 453 return &NewWebUI<chromeos::NfcDebugUI>;
462 if (url.host() == chrome::kChromeUIOobeHost) 454 if (url.host() == chrome::kChromeUIOobeHost)
463 return &NewWebUI<chromeos::OobeUI>; 455 return &NewWebUI<chromeos::OobeUI>;
464 if (url.host() == chrome::kChromeUIOobeMdHost)
465 return &NewWebUI<OobeMdUI>;
466 if (url.host() == chrome::kChromeUIPowerHost) 456 if (url.host() == chrome::kChromeUIPowerHost)
467 return &NewWebUI<chromeos::PowerUI>; 457 return &NewWebUI<chromeos::PowerUI>;
468 if (url.host() == chrome::kChromeUIProvidedFileSystemsHost) 458 if (url.host() == chrome::kChromeUIProvidedFileSystemsHost)
469 return &NewWebUI<chromeos::ProvidedFileSystemsUI>; 459 return &NewWebUI<chromeos::ProvidedFileSystemsUI>;
470 if (url.host() == chrome::kChromeUIProxySettingsHost) 460 if (url.host() == chrome::kChromeUIProxySettingsHost)
471 return &NewWebUI<chromeos::ProxySettingsUI>; 461 return &NewWebUI<chromeos::ProxySettingsUI>;
472 if (url.host() == chrome::kChromeUISalsaHost) 462 if (url.host() == chrome::kChromeUISalsaHost)
473 return &NewWebUI<SalsaUI>; 463 return &NewWebUI<SalsaUI>;
474 if (url.host() == chrome::kChromeUISetTimeHost) 464 if (url.host() == chrome::kChromeUISetTimeHost)
475 return &NewWebUI<chromeos::SetTimeUI>; 465 return &NewWebUI<chromeos::SetTimeUI>;
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 #endif 757 #endif
768 758
769 // Android doesn't use the plugins pages. 759 // Android doesn't use the plugins pages.
770 if (page_url.host() == chrome::kChromeUIPluginsHost) 760 if (page_url.host() == chrome::kChromeUIPluginsHost)
771 return PluginsUI::GetFaviconResourceBytes(scale_factor); 761 return PluginsUI::GetFaviconResourceBytes(scale_factor);
772 762
773 #endif 763 #endif
774 764
775 return NULL; 765 return NULL;
776 } 766 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/oobe/oobe.cc ('k') | chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698