Only call X11DesktopHandler for USE_X11 builds
... and the same applies to calling ui::GetCustomFramePrefDefault,
implemented in ui/base/x/x11_util.cc
BUG=295089
Review-Url: https://codereview.chromium.org/2454743002
Cr-Commit-Position: refs/heads/master@{#427830}
diff --git a/chrome/browser/ui/browser_view_prefs.cc b/chrome/browser/ui/browser_view_prefs.cc
index 1bf1eb7..95555ba 100644
--- a/chrome/browser/ui/browser_view_prefs.cc
+++ b/chrome/browser/ui/browser_view_prefs.cc
@@ -32,7 +32,7 @@
void RegisterBrowserViewProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && defined(USE_X11)
registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
ui::GetCustomFramePrefDefault());
#endif
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index ccacf482..6fa5502 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -238,7 +238,7 @@
void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && defined(USE_X11)
BrowserList::MoveBrowsersInWorkspaceToFront(
views::X11DesktopHandler::get()->GetWorkspace());
#endif
