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

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

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 139 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
140 #include "chrome/browser/ui/sync/sync_promo_ui.h" 140 #include "chrome/browser/ui/sync/sync_promo_ui.h"
141 #endif 141 #endif
142 142
143 #if defined(OS_WIN) 143 #if defined(OS_WIN)
144 #include "chrome/browser/ui/webui/conflicts_ui.h" 144 #include "chrome/browser/ui/webui/conflicts_ui.h"
145 #include "chrome/browser/ui/webui/set_as_default_browser_ui.h" 145 #include "chrome/browser/ui/webui/set_as_default_browser_ui.h"
146 #endif 146 #endif
147 147
148 #if (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA) 148 #if (defined(USE_NSS_CERTS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
149 #include "chrome/browser/ui/webui/certificate_viewer_ui.h" 149 #include "chrome/browser/ui/webui/certificate_viewer_ui.h"
150 #endif 150 #endif
151 151
152 #if defined(ENABLE_SERVICE_DISCOVERY) 152 #if defined(ENABLE_SERVICE_DISCOVERY)
153 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 153 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
154 #endif 154 #endif
155 155
156 #if defined(ENABLE_APP_LIST) 156 #if defined(ENABLE_APP_LIST)
157 #include "chrome/browser/ui/webui/app_list/start_page_ui.h" 157 #include "chrome/browser/ui/webui/app_list/start_page_ui.h"
158 #endif 158 #endif
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 #endif 492 #endif
493 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) 493 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
494 if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) { 494 if (url.host() == chrome::kChromeUITabModalConfirmDialogHost) {
495 return &NewWebUI<ConstrainedWebDialogUI>; 495 return &NewWebUI<ConstrainedWebDialogUI>;
496 } 496 }
497 #endif 497 #endif
498 #if defined(USE_AURA) 498 #if defined(USE_AURA)
499 if (url.host() == chrome::kChromeUIGestureConfigHost) 499 if (url.host() == chrome::kChromeUIGestureConfigHost)
500 return &NewWebUI<GestureConfigUI>; 500 return &NewWebUI<GestureConfigUI>;
501 #endif 501 #endif
502 #if (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA) 502 #if (defined(USE_NSS_CERTS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
503 if (url.host() == chrome::kChromeUICertificateViewerHost) 503 if (url.host() == chrome::kChromeUICertificateViewerHost)
504 return &NewWebUI<CertificateViewerUI>; 504 return &NewWebUI<CertificateViewerUI>;
505 #if defined(OS_CHROMEOS) 505 #if defined(OS_CHROMEOS)
506 if (url.host() == chrome::kChromeUICertificateViewerDialogHost) 506 if (url.host() == chrome::kChromeUICertificateViewerDialogHost)
507 return &NewWebUI<CertificateViewerModalDialogUI>; 507 return &NewWebUI<CertificateViewerModalDialogUI>;
508 #endif 508 #endif
509 #endif // (defined(USE_NSS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA) 509 #endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA
510 510
511 #if defined(ENABLE_CONFIGURATION_POLICY) 511 #if defined(ENABLE_CONFIGURATION_POLICY)
512 if (url.host() == chrome::kChromeUIPolicyHost) 512 if (url.host() == chrome::kChromeUIPolicyHost)
513 return &NewWebUI<PolicyUI>; 513 return &NewWebUI<PolicyUI>;
514 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 514 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
515 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost) 515 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
516 return &NewWebUI<ProfileSigninConfirmationUI>; 516 return &NewWebUI<ProfileSigninConfirmationUI>;
517 #endif 517 #endif
518 #endif // defined(ENABLE_CONFIGURATION_POLICY) 518 #endif // defined(ENABLE_CONFIGURATION_POLICY)
519 519
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 #endif 735 #endif
736 736
737 // Android doesn't use the plugins pages. 737 // Android doesn't use the plugins pages.
738 if (page_url.host() == chrome::kChromeUIPluginsHost) 738 if (page_url.host() == chrome::kChromeUIPluginsHost)
739 return PluginsUI::GetFaviconResourceBytes(scale_factor); 739 return PluginsUI::GetFaviconResourceBytes(scale_factor);
740 740
741 #endif 741 #endif
742 742
743 return NULL; 743 return NULL;
744 } 744 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698