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

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

Issue 1536553002: Remove InlineLoginHandlerChromeOS and exclude InlineLoginUI from CrOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge conflicts resolved. Created 4 years, 11 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "chrome/browser/ui/webui/md_history_ui.h" 44 #include "chrome/browser/ui/webui/md_history_ui.h"
45 #include "chrome/browser/ui/webui/memory_internals/memory_internals_ui.h" 45 #include "chrome/browser/ui/webui/memory_internals/memory_internals_ui.h"
46 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" 46 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
47 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" 47 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
48 #include "chrome/browser/ui/webui/options/options_ui.h" 48 #include "chrome/browser/ui/webui/options/options_ui.h"
49 #include "chrome/browser/ui/webui/password_manager_internals/password_manager_in ternals_ui.h" 49 #include "chrome/browser/ui/webui/password_manager_internals/password_manager_in ternals_ui.h"
50 #include "chrome/browser/ui/webui/plugins/plugins_ui.h" 50 #include "chrome/browser/ui/webui/plugins/plugins_ui.h"
51 #include "chrome/browser/ui/webui/predictors/predictors_ui.h" 51 #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
52 #include "chrome/browser/ui/webui/profiler_ui.h" 52 #include "chrome/browser/ui/webui/profiler_ui.h"
53 #include "chrome/browser/ui/webui/settings/md_settings_ui.h" 53 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
54 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
55 #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h" 54 #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.h"
56 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
57 #include "chrome/browser/ui/webui/signin/user_manager_ui.h"
58 #include "chrome/browser/ui/webui/signin_internals_ui.h" 55 #include "chrome/browser/ui/webui/signin_internals_ui.h"
59 #include "chrome/browser/ui/webui/supervised_user_internals_ui.h" 56 #include "chrome/browser/ui/webui/supervised_user_internals_ui.h"
60 #include "chrome/browser/ui/webui/sync_internals_ui.h" 57 #include "chrome/browser/ui/webui/sync_internals_ui.h"
61 #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h" 58 #include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
62 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h" 59 #include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
63 #include "chrome/browser/ui/webui/version_ui.h" 60 #include "chrome/browser/ui/webui/version_ui.h"
64 #include "chrome/common/chrome_switches.h" 61 #include "chrome/common/chrome_switches.h"
65 #include "chrome/common/pref_names.h" 62 #include "chrome/common/pref_names.h"
66 #include "chrome/common/url_constants.h" 63 #include "chrome/common/url_constants.h"
67 #include "components/dom_distiller/core/dom_distiller_constants.h" 64 #include "components/dom_distiller/core/dom_distiller_constants.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 #include "chrome/browser/signin/easy_unlock_service_factory.h" 117 #include "chrome/browser/signin/easy_unlock_service_factory.h"
121 #include "chrome/browser/ui/webui/copresence_ui.h" 118 #include "chrome/browser/ui/webui/copresence_ui.h"
122 #include "chrome/browser/ui/webui/devtools_ui.h" 119 #include "chrome/browser/ui/webui/devtools_ui.h"
123 #include "chrome/browser/ui/webui/inspect_ui.h" 120 #include "chrome/browser/ui/webui/inspect_ui.h"
124 #endif 121 #endif
125 122
126 #if defined(OS_ANDROID) 123 #if defined(OS_ANDROID)
127 #include "chrome/browser/ui/webui/popular_sites_internals_ui.h" 124 #include "chrome/browser/ui/webui/popular_sites_internals_ui.h"
128 #endif 125 #endif
129 126
127 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
128 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
129 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
130 #include "chrome/browser/ui/webui/signin/user_manager_ui.h"
131 #endif
132
130 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
131 #include "base/sys_info.h" 134 #include "base/sys_info.h"
132 #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h" 135 #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h"
133 #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h" 136 #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h"
134 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" 137 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
135 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h" 138 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h"
136 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h" 139 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"
137 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h" 140 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
138 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h" 141 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
139 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 142 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 return &NewWebUI<DeviceEmulatorUI>; 489 return &NewWebUI<DeviceEmulatorUI>;
487 } 490 }
488 #endif // !defined(GOOGLE_CHROME_BUILD) && !defined(NDEBUG) 491 #endif // !defined(GOOGLE_CHROME_BUILD) && !defined(NDEBUG)
489 #endif // defined(OS_CHROMEOS) 492 #endif // defined(OS_CHROMEOS)
490 #if defined(OS_ANDROID) || defined(OS_IOS) 493 #if defined(OS_ANDROID) || defined(OS_IOS)
491 if (url.host() == chrome::kChromeUINetExportHost) 494 if (url.host() == chrome::kChromeUINetExportHost)
492 return &NewWebUI<NetExportUI>; 495 return &NewWebUI<NetExportUI>;
493 #else 496 #else
494 if (url.host() == chrome::kChromeUICopresenceHost) 497 if (url.host() == chrome::kChromeUICopresenceHost)
495 return &NewWebUI<CopresenceUI>; 498 return &NewWebUI<CopresenceUI>;
496 if (url.host() == chrome::kChromeUIChromeSigninHost)
497 return &NewWebUI<InlineLoginUI>;
498 if (url.SchemeIs(content::kChromeDevToolsScheme)) 499 if (url.SchemeIs(content::kChromeDevToolsScheme))
499 return &NewWebUI<DevToolsUI>; 500 return &NewWebUI<DevToolsUI>;
500 501
501 // chrome://inspect isn't supported on Android nor iOS. Page debugging is 502 // chrome://inspect isn't supported on Android nor iOS. Page debugging is
502 // handled by a remote devtools on the host machine, and other elements, i.e. 503 // handled by a remote devtools on the host machine, and other elements, i.e.
503 // extensions aren't supported. 504 // extensions aren't supported.
504 if (url.host() == chrome::kChromeUIInspectHost) 505 if (url.host() == chrome::kChromeUIInspectHost)
505 return &NewWebUI<InspectUI>; 506 return &NewWebUI<InspectUI>;
506 #endif 507 #endif
507 #if defined(OS_ANDROID) 508 #if defined(OS_ANDROID)
508 if (url.host() == chrome::kChromeUIPopularSitesInternalsHost) 509 if (url.host() == chrome::kChromeUIPopularSitesInternalsHost)
509 return &NewWebUI<PopularSitesInternalsUI>; 510 return &NewWebUI<PopularSitesInternalsUI>;
510 #endif 511 #endif
511 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 512 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
513 if (url.host() == chrome::kChromeUIChromeSigninHost)
514 return &NewWebUI<InlineLoginUI>;
512 if (url.host() == chrome::kChromeUIUserManagerHost) 515 if (url.host() == chrome::kChromeUIUserManagerHost)
513 return &NewWebUI<UserManagerUI>; 516 return &NewWebUI<UserManagerUI>;
514 if (url.host() == chrome::kChromeUISyncConfirmationHost) 517 if (url.host() == chrome::kChromeUISyncConfirmationHost)
515 return &NewWebUI<SyncConfirmationUI>; 518 return &NewWebUI<SyncConfirmationUI>;
516 #endif 519 #endif
517 520
518 /**************************************************************************** 521 /****************************************************************************
519 * Other #defines and special logics. 522 * Other #defines and special logics.
520 ***************************************************************************/ 523 ***************************************************************************/
521 #if !defined(DISABLE_NACL) 524 #if !defined(DISABLE_NACL)
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 #endif 792 #endif
790 793
791 // Android doesn't use the plugins pages. 794 // Android doesn't use the plugins pages.
792 if (page_url.host() == chrome::kChromeUIPluginsHost) 795 if (page_url.host() == chrome::kChromeUIPluginsHost)
793 return PluginsUI::GetFaviconResourceBytes(scale_factor); 796 return PluginsUI::GetFaviconResourceBytes(scale_factor);
794 797
795 #endif 798 #endif
796 799
797 return NULL; 800 return NULL;
798 } 801 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698