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

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

Issue 1321713004: Flag for Material Design policy construction page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Readded destructor. Created 5 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 <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 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 return &NewWebUI<CertificateViewerUI>; 537 return &NewWebUI<CertificateViewerUI>;
538 #if defined(OS_CHROMEOS) 538 #if defined(OS_CHROMEOS)
539 if (url.host() == chrome::kChromeUICertificateViewerDialogHost) 539 if (url.host() == chrome::kChromeUICertificateViewerDialogHost)
540 return &NewWebUI<CertificateViewerModalDialogUI>; 540 return &NewWebUI<CertificateViewerModalDialogUI>;
541 #endif 541 #endif
542 #endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA 542 #endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA
543 543
544 #if defined(ENABLE_CONFIGURATION_POLICY) 544 #if defined(ENABLE_CONFIGURATION_POLICY)
545 if (url.host() == chrome::kChromeUIPolicyHost) 545 if (url.host() == chrome::kChromeUIPolicyHost)
546 return &NewWebUI<PolicyUI>; 546 return &NewWebUI<PolicyUI>;
547 if (url.host() == chrome::kChromeUIMdPolicyHost &&
548 switches::MdPolicyPageEnabled())
Dan Beam 2015/10/06 16:00:14 nit: curlies
fhorschig 2015/10/06 16:57:13 Done.
549 return &NewWebUI<PolicyMaterialDesignUI>;
547 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 550 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
548 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost) 551 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
549 return &NewWebUI<ProfileSigninConfirmationUI>; 552 return &NewWebUI<ProfileSigninConfirmationUI>;
550 #endif 553 #endif
551 #endif // defined(ENABLE_CONFIGURATION_POLICY) 554 #endif // defined(ENABLE_CONFIGURATION_POLICY)
552 555
553 #if defined(ENABLE_APP_LIST) 556 #if defined(ENABLE_APP_LIST)
554 if (url.host() == chrome::kChromeUIAppListStartPageHost) 557 if (url.host() == chrome::kChromeUIAppListStartPageHost)
555 return &NewWebUI<app_list::StartPageUI>; 558 return &NewWebUI<app_list::StartPageUI>;
556 #endif 559 #endif
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 #endif 790 #endif
788 791
789 // Android doesn't use the plugins pages. 792 // Android doesn't use the plugins pages.
790 if (page_url.host() == chrome::kChromeUIPluginsHost) 793 if (page_url.host() == chrome::kChromeUIPluginsHost)
791 return PluginsUI::GetFaviconResourceBytes(scale_factor); 794 return PluginsUI::GetFaviconResourceBytes(scale_factor);
792 795
793 #endif 796 #endif
794 797
795 return NULL; 798 return NULL;
796 } 799 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698