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

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

Issue 2406303003: Move enable_app_list to a buildflag. (Closed)
Patch Set: More grit defines 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 #endif 174 #endif
175 175
176 #if (defined(USE_NSS_CERTS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA) 176 #if (defined(USE_NSS_CERTS) || defined(USE_OPENSSL_CERTS)) && defined(USE_AURA)
177 #include "chrome/browser/ui/webui/certificate_viewer_ui.h" 177 #include "chrome/browser/ui/webui/certificate_viewer_ui.h"
178 #endif 178 #endif
179 179
180 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 180 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
181 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 181 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
182 #endif 182 #endif
183 183
184 #if defined(ENABLE_APP_LIST) 184 #if BUILDFLAG(ENABLE_APP_LIST)
185 #include "chrome/browser/ui/webui/app_list/start_page_ui.h" 185 #include "chrome/browser/ui/webui/app_list/start_page_ui.h"
186 #endif 186 #endif
187 187
188 #if defined(ENABLE_EXTENSIONS) 188 #if defined(ENABLE_EXTENSIONS)
189 #include "chrome/browser/extensions/extension_web_ui.h" 189 #include "chrome/browser/extensions/extension_web_ui.h"
190 #include "chrome/browser/ui/webui/extensions/extensions_ui.h" 190 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
191 #include "chrome/common/extensions/extension_constants.h" 191 #include "chrome/common/extensions/extension_constants.h"
192 #include "extensions/browser/extension_registry.h" 192 #include "extensions/browser/extension_registry.h"
193 #include "extensions/browser/extension_system.h" 193 #include "extensions/browser/extension_system.h"
194 #include "extensions/common/constants.h" 194 #include "extensions/common/constants.h"
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 #endif 584 #endif
585 #endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA 585 #endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA
586 586
587 if (url.host() == chrome::kChromeUIPolicyHost) 587 if (url.host() == chrome::kChromeUIPolicyHost)
588 return &NewWebUI<PolicyUI>; 588 return &NewWebUI<PolicyUI>;
589 if (url.host() == chrome::kChromeUIMdPolicyHost && 589 if (url.host() == chrome::kChromeUIMdPolicyHost &&
590 switches::MdPolicyPageEnabled()) { 590 switches::MdPolicyPageEnabled()) {
591 return &NewWebUI<PolicyMaterialDesignUI>; 591 return &NewWebUI<PolicyMaterialDesignUI>;
592 } 592 }
593 593
594 #if defined(ENABLE_APP_LIST) 594 #if BUILDFLAG(ENABLE_APP_LIST)
595 if (url.host() == chrome::kChromeUIAppListStartPageHost) 595 if (url.host() == chrome::kChromeUIAppListStartPageHost)
596 return &NewWebUI<app_list::StartPageUI>; 596 return &NewWebUI<app_list::StartPageUI>;
597 #endif 597 #endif
598 #if defined(ENABLE_EXTENSIONS) 598 #if defined(ENABLE_EXTENSIONS)
599 if (url.host() == chrome::kChromeUIExtensionsFrameHost) 599 if (url.host() == chrome::kChromeUIExtensionsFrameHost)
600 return &NewWebUI<extensions::ExtensionsUI>; 600 return &NewWebUI<extensions::ExtensionsUI>;
601 #endif 601 #endif
602 #if defined(ENABLE_PLUGINS) 602 #if defined(ENABLE_PLUGINS)
603 if (url.host() == chrome::kChromeUIFlashHost) 603 if (url.host() == chrome::kChromeUIFlashHost)
604 return &NewWebUI<FlashUI>; 604 return &NewWebUI<FlashUI>;
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 #endif 836 #endif
837 837
838 // Android doesn't use the plugins pages. 838 // Android doesn't use the plugins pages.
839 if (page_url.host() == chrome::kChromeUIPluginsHost) 839 if (page_url.host() == chrome::kChromeUIPluginsHost)
840 return PluginsUI::GetFaviconResourceBytes(scale_factor); 840 return PluginsUI::GetFaviconResourceBytes(scale_factor);
841 841
842 #endif 842 #endif
843 843
844 return NULL; 844 return NULL;
845 } 845 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698