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

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

Issue 2348423002: [Signin Error Dialog] (3/3) Added the triggering code (Closed)
Patch Set: Fix malformed function declaration on mac. Created 4 years, 2 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h" 152 #include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h"
153 #endif 153 #endif
154 154
155 #if !defined(OS_CHROMEOS) 155 #if !defined(OS_CHROMEOS)
156 #include "chrome/browser/ui/webui/app_launcher_page_ui.h" 156 #include "chrome/browser/ui/webui/app_launcher_page_ui.h"
157 #endif 157 #endif
158 158
159 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 159 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
160 #include "chrome/browser/ui/sync/sync_promo_ui.h" 160 #include "chrome/browser/ui/sync/sync_promo_ui.h"
161 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" 161 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
162 #include "chrome/browser/ui/webui/signin/signin_error_ui.h"
162 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h" 163 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
163 #include "chrome/browser/ui/webui/signin/user_manager_ui.h" 164 #include "chrome/browser/ui/webui/signin/user_manager_ui.h"
164 #include "chrome/browser/ui/webui/welcome_ui.h" 165 #include "chrome/browser/ui/webui/welcome_ui.h"
165 #endif 166 #endif
166 167
167 #if defined(OS_WIN) 168 #if defined(OS_WIN)
168 #include "chrome/browser/ui/webui/conflicts_ui.h" 169 #include "chrome/browser/ui/webui/conflicts_ui.h"
169 #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h" 170 #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
170 #endif 171 #endif
171 172
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 if (url.host() == chrome::kChromeUIInspectHost) 539 if (url.host() == chrome::kChromeUIInspectHost)
539 return &NewWebUI<InspectUI>; 540 return &NewWebUI<InspectUI>;
540 #endif 541 #endif
541 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 542 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
542 if (url.host() == chrome::kChromeUIChromeSigninHost) 543 if (url.host() == chrome::kChromeUIChromeSigninHost)
543 return &NewWebUI<InlineLoginUI>; 544 return &NewWebUI<InlineLoginUI>;
544 if (url.host() == chrome::kChromeUIUserManagerHost) 545 if (url.host() == chrome::kChromeUIUserManagerHost)
545 return &NewWebUI<UserManagerUI>; 546 return &NewWebUI<UserManagerUI>;
546 if (url.host() == chrome::kChromeUIMdUserManagerHost) 547 if (url.host() == chrome::kChromeUIMdUserManagerHost)
547 return &NewWebUI<MDUserManagerUI>; 548 return &NewWebUI<MDUserManagerUI>;
549 if (url.host() == chrome::kChromeUISigninErrorHost)
550 return &NewWebUI<SigninErrorUI>;
548 if (url.host() == chrome::kChromeUISyncConfirmationHost) 551 if (url.host() == chrome::kChromeUISyncConfirmationHost)
549 return &NewWebUI<SyncConfirmationUI>; 552 return &NewWebUI<SyncConfirmationUI>;
550 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost) 553 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
551 return &NewWebUI<ProfileSigninConfirmationUI>; 554 return &NewWebUI<ProfileSigninConfirmationUI>;
552 if (url.host() == chrome::kChromeUIWelcomeHost) 555 if (url.host() == chrome::kChromeUIWelcomeHost)
553 return &NewWebUI<WelcomeUI>; 556 return &NewWebUI<WelcomeUI>;
554 #endif 557 #endif
555 558
556 /**************************************************************************** 559 /****************************************************************************
557 * Other #defines and special logics. 560 * Other #defines and special logics.
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 #endif 829 #endif
827 830
828 // Android doesn't use the plugins pages. 831 // Android doesn't use the plugins pages.
829 if (page_url.host() == chrome::kChromeUIPluginsHost) 832 if (page_url.host() == chrome::kChromeUIPluginsHost)
830 return PluginsUI::GetFaviconResourceBytes(scale_factor); 833 return PluginsUI::GetFaviconResourceBytes(scale_factor);
831 834
832 #endif 835 #endif
833 836
834 return NULL; 837 return NULL;
835 } 838 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698