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

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

Issue 2255413002: [Signin Error Dialog] (3/3) Added the triggering code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Broke down the CL Created 4 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) 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 #include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h" 150 #include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h"
151 #endif 151 #endif
152 152
153 #if !defined(OS_CHROMEOS) 153 #if !defined(OS_CHROMEOS)
154 #include "chrome/browser/ui/webui/app_launcher_page_ui.h" 154 #include "chrome/browser/ui/webui/app_launcher_page_ui.h"
155 #endif 155 #endif
156 156
157 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 157 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
158 #include "chrome/browser/ui/sync/sync_promo_ui.h" 158 #include "chrome/browser/ui/sync/sync_promo_ui.h"
159 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" 159 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
160 #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
160 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h" 161 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
161 #include "chrome/browser/ui/webui/signin/user_manager_ui.h" 162 #include "chrome/browser/ui/webui/signin/user_manager_ui.h"
162 #endif 163 #endif
163 164
164 #if defined(OS_WIN) 165 #if defined(OS_WIN)
165 #include "chrome/browser/ui/webui/conflicts_ui.h" 166 #include "chrome/browser/ui/webui/conflicts_ui.h"
166 #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h" 167 #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
167 #endif 168 #endif
168 169
169 #if (defined(USE_NSS_CERTS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA) 170 #if (defined(USE_NSS_CERTS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 if (url.host() == chrome::kChromeUIInspectHost) 527 if (url.host() == chrome::kChromeUIInspectHost)
527 return &NewWebUI<InspectUI>; 528 return &NewWebUI<InspectUI>;
528 #endif 529 #endif
529 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 530 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
530 if (url.host() == chrome::kChromeUIChromeSigninHost) 531 if (url.host() == chrome::kChromeUIChromeSigninHost)
531 return &NewWebUI<InlineLoginUI>; 532 return &NewWebUI<InlineLoginUI>;
532 if (url.host() == chrome::kChromeUIUserManagerHost) 533 if (url.host() == chrome::kChromeUIUserManagerHost)
533 return &NewWebUI<UserManagerUI>; 534 return &NewWebUI<UserManagerUI>;
534 if (url.host() == chrome::kChromeUIMdUserManagerHost) 535 if (url.host() == chrome::kChromeUIMdUserManagerHost)
535 return &NewWebUI<MDUserManagerUI>; 536 return &NewWebUI<MDUserManagerUI>;
537 if (url.host() == chrome::kChromeUISigninErrorHost)
538 return &NewWebUI<SigninErrorUI>;
536 if (url.host() == chrome::kChromeUISyncConfirmationHost) 539 if (url.host() == chrome::kChromeUISyncConfirmationHost)
537 return &NewWebUI<SyncConfirmationUI>; 540 return &NewWebUI<SyncConfirmationUI>;
538 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost) 541 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
539 return &NewWebUI<ProfileSigninConfirmationUI>; 542 return &NewWebUI<ProfileSigninConfirmationUI>;
540 #endif 543 #endif
541 544
542 /**************************************************************************** 545 /****************************************************************************
543 * Other #defines and special logics. 546 * Other #defines and special logics.
544 ***************************************************************************/ 547 ***************************************************************************/
545 #if !defined(DISABLE_NACL) 548 #if !defined(DISABLE_NACL)
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 #endif 815 #endif
813 816
814 // Android doesn't use the plugins pages. 817 // Android doesn't use the plugins pages.
815 if (page_url.host() == chrome::kChromeUIPluginsHost) 818 if (page_url.host() == chrome::kChromeUIPluginsHost)
816 return PluginsUI::GetFaviconResourceBytes(scale_factor); 819 return PluginsUI::GetFaviconResourceBytes(scale_factor);
817 820
818 #endif 821 #endif
819 822
820 return NULL; 823 return NULL;
821 } 824 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698