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

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

Issue 2680723003: Remove ENABLE_VR_SHELL compile-time define. (Closed)
Patch Set: Created 3 years, 10 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 #endif 108 #endif
109 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) 109 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
110 #include "chrome/browser/ui/webui/cast/cast_ui.h" 110 #include "chrome/browser/ui/webui/cast/cast_ui.h"
111 #endif 111 #endif
112 #endif 112 #endif
113 113
114 #if defined(OS_ANDROID) 114 #if defined(OS_ANDROID)
115 #include "chrome/browser/ui/webui/offline/offline_internals_ui.h" 115 #include "chrome/browser/ui/webui/offline/offline_internals_ui.h"
116 #include "chrome/browser/ui/webui/popular_sites_internals_ui.h" 116 #include "chrome/browser/ui/webui/popular_sites_internals_ui.h"
117 #include "chrome/browser/ui/webui/snippets_internals_ui.h" 117 #include "chrome/browser/ui/webui/snippets_internals_ui.h"
118 #if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR) 118 #if defined(ENABLE_WEBVR)
119 #include "chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.h" 119 #include "chrome/browser/ui/webui/vr_shell/vr_shell_ui_ui.h"
120 #endif 120 #endif
121 #else 121 #else
122 #include "chrome/browser/signin/easy_unlock_service.h" 122 #include "chrome/browser/signin/easy_unlock_service.h"
123 #include "chrome/browser/signin/easy_unlock_service_factory.h" 123 #include "chrome/browser/signin/easy_unlock_service_factory.h"
124 #include "chrome/browser/ui/webui/devtools_ui.h" 124 #include "chrome/browser/ui/webui/devtools_ui.h"
125 #include "chrome/browser/ui/webui/inspect_ui.h" 125 #include "chrome/browser/ui/webui/inspect_ui.h"
126 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h" 126 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h"
127 #include "chrome/browser/ui/webui/md_downloads/md_downloads_ui.h" 127 #include "chrome/browser/ui/webui/md_downloads/md_downloads_ui.h"
128 #include "chrome/browser/ui/webui/md_feedback/md_feedback_ui.h" 128 #include "chrome/browser/ui/webui/md_feedback/md_feedback_ui.h"
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 #endif // !defined(OFFICIAL_BUILD) 512 #endif // !defined(OFFICIAL_BUILD)
513 #endif // defined(OS_CHROMEOS) 513 #endif // defined(OS_CHROMEOS)
514 #if defined(OS_ANDROID) 514 #if defined(OS_ANDROID)
515 if (url.host_piece() == chrome::kChromeUIOfflineInternalsHost) 515 if (url.host_piece() == chrome::kChromeUIOfflineInternalsHost)
516 return &NewWebUI<OfflineInternalsUI>; 516 return &NewWebUI<OfflineInternalsUI>;
517 if (url.host_piece() == chrome::kChromeUIPopularSitesInternalsHost) 517 if (url.host_piece() == chrome::kChromeUIPopularSitesInternalsHost)
518 return &NewWebUI<PopularSitesInternalsUI>; 518 return &NewWebUI<PopularSitesInternalsUI>;
519 if (url.host_piece() == chrome::kChromeUISnippetsInternalsHost && 519 if (url.host_piece() == chrome::kChromeUISnippetsInternalsHost &&
520 !profile->IsOffTheRecord()) 520 !profile->IsOffTheRecord())
521 return &NewWebUI<SnippetsInternalsUI>; 521 return &NewWebUI<SnippetsInternalsUI>;
522 #if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR) 522 #if defined(ENABLE_WEBVR)
523 if (url.host_piece() == chrome::kChromeUIVrShellUIHost) 523 if (url.host_piece() == chrome::kChromeUIVrShellUIHost)
524 return &NewWebUI<VrShellUIUI>; 524 return &NewWebUI<VrShellUIUI>;
525 #endif 525 #endif
526 #else 526 #else
527 if (url.SchemeIs(content::kChromeDevToolsScheme)) { 527 if (url.SchemeIs(content::kChromeDevToolsScheme)) {
528 if (!DevToolsUIBindings::IsValidFrontendURL(url)) 528 if (!DevToolsUIBindings::IsValidFrontendURL(url))
529 return nullptr; 529 return nullptr;
530 return &NewWebUI<DevToolsUI>; 530 return &NewWebUI<DevToolsUI>;
531 } 531 }
532 // chrome://inspect isn't supported on Android nor iOS. Page debugging is 532 // chrome://inspect isn't supported on Android nor iOS. Page debugging is
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 818
819 #if BUILDFLAG(ENABLE_EXTENSIONS) 819 #if BUILDFLAG(ENABLE_EXTENSIONS)
820 if (page_url.host_piece() == chrome::kChromeUIExtensionsHost || 820 if (page_url.host_piece() == chrome::kChromeUIExtensionsHost ||
821 page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost) 821 page_url.host_piece() == chrome::kChromeUIExtensionsFrameHost)
822 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor); 822 return extensions::ExtensionsUI::GetFaviconResourceBytes(scale_factor);
823 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 823 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
824 #endif // !defined(OS_ANDROID) 824 #endif // !defined(OS_ANDROID)
825 825
826 return NULL; 826 return NULL;
827 } 827 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698