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

Unified Diff: chrome/browser/ui/webui/uber/uber_ui.cc

Issue 2927273002: Move code for old, deprecated Options UI to only ChromeOS (Closed)
Patch Set: check_gn_headers 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/uber/uber_ui.cc
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index aa7a4f95bf5173dc71fddf9f18ae7ff716e9b46f..966231d3162e821452d3cc6ae16af17ee9e6e6cf 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
#include "chrome/browser/ui/webui/extensions/extensions_ui.h"
#include "chrome/browser/ui/webui/log_web_ui_url.h"
-#include "chrome/browser/ui/webui/options/options_ui.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/chrome_manifest_url_handlers.h"
@@ -30,6 +29,10 @@
#include "content/public/browser/web_ui_data_source.h"
#include "content/public/common/browser_side_navigation_policy.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/webui/options/options_ui.h"
+#endif
+
using content::NavigationController;
using content::NavigationEntry;
using content::RenderFrameHost;
@@ -127,8 +130,10 @@ UberUI::UberUI(content::WebUI* web_ui) : WebUIController(web_ui) {
chrome::kChromeUIExtensionsHost);
RegisterSubpage(chrome::kChromeUIHelpFrameURL,
chrome::kChromeUIHelpHost);
+#if defined(OS_CHROMEOS)
RegisterSubpage(chrome::kChromeUISettingsFrameURL,
chrome::kChromeUISettingsHost);
+#endif
RegisterSubpage(chrome::kChromeUIUberFrameURL,
chrome::kChromeUIUberHost);
}

Powered by Google App Engine
This is Rietveld 408576698