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

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

Issue 2931243002: Unframe chrome://extensions as it's the last (and only) uber item (Closed)
Patch Set: devlin Created 3 years, 6 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 14 matching lines...) Expand all
25 #include "chrome/browser/ui/webui/bookmarks_ui.h" 25 #include "chrome/browser/ui/webui/bookmarks_ui.h"
26 #include "chrome/browser/ui/webui/components_ui.h" 26 #include "chrome/browser/ui/webui/components_ui.h"
27 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" 27 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
28 #include "chrome/browser/ui/webui/crashes_ui.h" 28 #include "chrome/browser/ui/webui/crashes_ui.h"
29 #include "chrome/browser/ui/webui/device_log_ui.h" 29 #include "chrome/browser/ui/webui/device_log_ui.h"
30 #include "chrome/browser/ui/webui/domain_reliability_internals_ui.h" 30 #include "chrome/browser/ui/webui/domain_reliability_internals_ui.h"
31 #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h" 31 #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h"
32 #include "chrome/browser/ui/webui/flags_ui.h" 32 #include "chrome/browser/ui/webui/flags_ui.h"
33 #include "chrome/browser/ui/webui/flash_ui.h" 33 #include "chrome/browser/ui/webui/flash_ui.h"
34 #include "chrome/browser/ui/webui/gcm_internals_ui.h" 34 #include "chrome/browser/ui/webui/gcm_internals_ui.h"
35 #include "chrome/browser/ui/webui/help/help_ui.h"
36 #include "chrome/browser/ui/webui/identity_internals_ui.h" 35 #include "chrome/browser/ui/webui/identity_internals_ui.h"
37 #include "chrome/browser/ui/webui/instant_ui.h" 36 #include "chrome/browser/ui/webui/instant_ui.h"
38 #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h" 37 #include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
39 #include "chrome/browser/ui/webui/invalidations_ui.h" 38 #include "chrome/browser/ui/webui/invalidations_ui.h"
40 #include "chrome/browser/ui/webui/local_state/local_state_ui.h" 39 #include "chrome/browser/ui/webui/local_state/local_state_ui.h"
41 #include "chrome/browser/ui/webui/log_web_ui_url.h" 40 #include "chrome/browser/ui/webui/log_web_ui_url.h"
42 #include "chrome/browser/ui/webui/net_export_ui.h" 41 #include "chrome/browser/ui/webui/net_export_ui.h"
43 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h" 42 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
44 #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h" 43 #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
45 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h" 44 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #include "chrome/browser/signin/easy_unlock_service_factory.h" 117 #include "chrome/browser/signin/easy_unlock_service_factory.h"
119 #include "chrome/browser/ui/webui/devtools_ui.h" 118 #include "chrome/browser/ui/webui/devtools_ui.h"
120 #include "chrome/browser/ui/webui/inspect_ui.h" 119 #include "chrome/browser/ui/webui/inspect_ui.h"
121 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h" 120 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h"
122 #include "chrome/browser/ui/webui/md_downloads/md_downloads_ui.h" 121 #include "chrome/browser/ui/webui/md_downloads/md_downloads_ui.h"
123 #include "chrome/browser/ui/webui/md_feedback/md_feedback_ui.h" 122 #include "chrome/browser/ui/webui/md_feedback/md_feedback_ui.h"
124 #include "chrome/browser/ui/webui/md_history_ui.h" 123 #include "chrome/browser/ui/webui/md_history_ui.h"
125 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 124 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
126 #include "chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_in ternals_ui.h" 125 #include "chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_in ternals_ui.h"
127 #include "chrome/browser/ui/webui/system_info_ui.h" 126 #include "chrome/browser/ui/webui/system_info_ui.h"
128 #include "chrome/browser/ui/webui/uber/uber_ui.h"
129 #endif 127 #endif
130 128
131 #if defined(OS_CHROMEOS) 129 #if defined(OS_CHROMEOS)
132 #include "base/sys_info.h" 130 #include "base/sys_info.h"
133 #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h" 131 #include "chrome/browser/ui/webui/chromeos/bluetooth_pairing_ui.h"
134 #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h" 132 #include "chrome/browser/ui/webui/chromeos/certificate_manager_dialog_ui.h"
135 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h" 133 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
136 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h" 134 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h"
137 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h" 135 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"
138 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h" 136 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 } 405 }
408 // Downloads list on Android uses the built-in download manager. 406 // Downloads list on Android uses the built-in download manager.
409 if (url.host_piece() == chrome::kChromeUIDownloadsHost) 407 if (url.host_piece() == chrome::kChromeUIDownloadsHost)
410 return &NewWebUI<MdDownloadsUI>; 408 return &NewWebUI<MdDownloadsUI>;
411 // Material Design feedback. Feedback is implemented separately in 409 // Material Design feedback. Feedback is implemented separately in
412 // Android. 410 // Android.
413 if (url.host_piece() == chrome::kChromeUIFeedbackHost && 411 if (url.host_piece() == chrome::kChromeUIFeedbackHost &&
414 ::switches::MdFeedbackEnabled()) { 412 ::switches::MdFeedbackEnabled()) {
415 return &NewWebUI<MdFeedbackUI>; 413 return &NewWebUI<MdFeedbackUI>;
416 } 414 }
417 // Help is implemented with native UI elements on Android.
418 if (url.host_piece() == chrome::kChromeUIHelpFrameHost)
419 return &NewWebUI<HelpUI>;
420 // Identity API is not available on Android. 415 // Identity API is not available on Android.
421 if (url.host_piece() == chrome::kChromeUIIdentityInternalsHost) 416 if (url.host_piece() == chrome::kChromeUIIdentityInternalsHost)
422 return &NewWebUI<IdentityInternalsUI>; 417 return &NewWebUI<IdentityInternalsUI>;
423 if (url.host_piece() == chrome::kChromeUINewTabHost) 418 if (url.host_piece() == chrome::kChromeUINewTabHost)
424 return &NewWebUI<NewTabUI>; 419 return &NewWebUI<NewTabUI>;
425 // Settings are implemented with native UI elements on Android. 420 // Settings are implemented with native UI elements on Android.
426 if (url.host_piece() == chrome::kChromeUISettingsHost || 421 if (url.host_piece() == chrome::kChromeUISettingsHost ||
427 url.host_piece() == chrome::kChromeUIMdSettingsHost) { 422 url.host_piece() == chrome::kChromeUIMdSettingsHost) {
428 return &NewWebUI<settings::MdSettingsUI>; 423 return &NewWebUI<settings::MdSettingsUI>;
429 } 424 }
430 // If the material design extensions page is enabled, it gets its own host. 425 if (url.host_piece() == chrome::kChromeUIExtensionsHost)
431 // Otherwise, it's handled by the uber settings page.
432 if (url.host_piece() == chrome::kChromeUIExtensionsHost &&
433 base::FeatureList::IsEnabled(features::kMaterialDesignExtensions)) {
434 return &NewWebUI<extensions::ExtensionsUI>; 426 return &NewWebUI<extensions::ExtensionsUI>;
435 }
436 if (url.host_piece() == chrome::kChromeUIHistoryHost) 427 if (url.host_piece() == chrome::kChromeUIHistoryHost)
437 return &NewWebUI<MdHistoryUI>; 428 return &NewWebUI<MdHistoryUI>;
438 if (url.host_piece() == chrome::kChromeUISyncFileSystemInternalsHost) 429 if (url.host_piece() == chrome::kChromeUISyncFileSystemInternalsHost)
439 return &NewWebUI<SyncFileSystemInternalsUI>; 430 return &NewWebUI<SyncFileSystemInternalsUI>;
440 if (url.host_piece() == chrome::kChromeUISystemInfoHost) 431 if (url.host_piece() == chrome::kChromeUISystemInfoHost)
441 return &NewWebUI<SystemInfoUI>; 432 return &NewWebUI<SystemInfoUI>;
442 // Uber frame is not used on Android.
443 if (url.host_piece() == chrome::kChromeUIUberFrameHost)
444 return &NewWebUI<UberFrameUI>;
445 // Uber page is not used on Android.
446 if (url.host_piece() == chrome::kChromeUIUberHost)
447 return &NewWebUI<UberUI>;
448 #endif // !defined(OS_ANDROID) 433 #endif // !defined(OS_ANDROID)
449 #if defined(OS_WIN) 434 #if defined(OS_WIN)
450 if (url.host_piece() == chrome::kChromeUIConflictsHost) 435 if (url.host_piece() == chrome::kChromeUIConflictsHost)
451 return &NewWebUI<ConflictsUI>; 436 return &NewWebUI<ConflictsUI>;
452 if (url.host_piece() == chrome::kChromeUIMetroFlowHost) 437 if (url.host_piece() == chrome::kChromeUIMetroFlowHost)
453 return &NewWebUI<SetAsDefaultBrowserUI>; 438 return &NewWebUI<SetAsDefaultBrowserUI>;
454 #endif 439 #endif
455 #if defined(OS_CHROMEOS) 440 #if defined(OS_CHROMEOS)
456 if (url.host_piece() == chrome::kChromeUIBluetoothPairingHost) 441 if (url.host_piece() == chrome::kChromeUIBluetoothPairingHost)
457 return &NewWebUI<chromeos::BluetoothPairingUI>; 442 return &NewWebUI<chromeos::BluetoothPairingUI>;
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 793
809 #if BUILDFLAG(ENABLE_EXTENSIONS) 794 #if BUILDFLAG(ENABLE_EXTENSIONS)
810 if (page_url.host_piece() == chrome::kChromeUIExtensionsHost || 795 if (page_url.host_piece() == chrome::kChromeUIExtensionsHost ||
811 page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost) 796 page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost)
812 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor); 797 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor);
813 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 798 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
814 #endif // !defined(OS_ANDROID) 799 #endif // !defined(OS_ANDROID)
815 800
816 return NULL; 801 return NULL;
817 } 802 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698