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

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: Addressing nits. 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
« no previous file with comments | « chrome/browser/resources/md_policy/md_policy.html ('k') | chrome/browser/ui/webui/policy_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 return &NewWebUI<CertificateViewerUI>; 535 return &NewWebUI<CertificateViewerUI>;
536 #if defined(OS_CHROMEOS) 536 #if defined(OS_CHROMEOS)
537 if (url.host() == chrome::kChromeUICertificateViewerDialogHost) 537 if (url.host() == chrome::kChromeUICertificateViewerDialogHost)
538 return &NewWebUI<CertificateViewerModalDialogUI>; 538 return &NewWebUI<CertificateViewerModalDialogUI>;
539 #endif 539 #endif
540 #endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA 540 #endif // (USE_NSS_CERTS || USE_OPENSSL_CERTS) && USE_AURA
541 541
542 #if defined(ENABLE_CONFIGURATION_POLICY) 542 #if defined(ENABLE_CONFIGURATION_POLICY)
543 if (url.host() == chrome::kChromeUIPolicyHost) 543 if (url.host() == chrome::kChromeUIPolicyHost)
544 return &NewWebUI<PolicyUI>; 544 return &NewWebUI<PolicyUI>;
545 if (url.host() == chrome::kChromeUIMdPolicyHost &&
546 switches::MdPolicyPageEnabled()) {
547 return &NewWebUI<PolicyMaterialDesignUI>;
548 }
545 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 549 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
546 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost) 550 if (url.host() == chrome::kChromeUIProfileSigninConfirmationHost)
547 return &NewWebUI<ProfileSigninConfirmationUI>; 551 return &NewWebUI<ProfileSigninConfirmationUI>;
548 #endif 552 #endif
549 #endif // defined(ENABLE_CONFIGURATION_POLICY) 553 #endif // defined(ENABLE_CONFIGURATION_POLICY)
550 554
551 #if defined(ENABLE_APP_LIST) 555 #if defined(ENABLE_APP_LIST)
552 if (url.host() == chrome::kChromeUIAppListStartPageHost) 556 if (url.host() == chrome::kChromeUIAppListStartPageHost)
553 return &NewWebUI<app_list::StartPageUI>; 557 return &NewWebUI<app_list::StartPageUI>;
554 #endif 558 #endif
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 #endif 789 #endif
786 790
787 // Android doesn't use the plugins pages. 791 // Android doesn't use the plugins pages.
788 if (page_url.host() == chrome::kChromeUIPluginsHost) 792 if (page_url.host() == chrome::kChromeUIPluginsHost)
789 return PluginsUI::GetFaviconResourceBytes(scale_factor); 793 return PluginsUI::GetFaviconResourceBytes(scale_factor);
790 794
791 #endif 795 #endif
792 796
793 return NULL; 797 return NULL;
794 } 798 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_policy/md_policy.html ('k') | chrome/browser/ui/webui/policy_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698