Condition the use of ChromeBrowserMainExtraPartsViewsLinux to !use_ozone

chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/libgtkui/gtk_ui.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
+#include "ui/views/widget/native_widget_aura.h"
+
+#if !defined(USE_OZONE)
+#include "chrome/browser/ui/libgtkui/gtk_ui.h"
+#endif
+
+#if defined(USE_X11)
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
-#include "ui/views/widget/native_widget_aura.h"
+#endif
 
 namespace {
 
 ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {

[Lei Zhang, 2016/11/01 21:36:25]

Is the Ozone build going to complain that this is dead code?

   if (!window)
     return nullptr;
 
   Profile* profile = nullptr;
   // Window types not listed here (such as tooltips) will never use Chrome
   // theming.
   if (window->type() == ui::wm::WINDOW_TYPE_NORMAL ||
       window->type() == ui::wm::WINDOW_TYPE_POPUP) {
     profile = reinterpret_cast<Profile*>(
         window->GetNativeWindowProperty(Profile::kProfileKey));
@@ skipping 16 matching lines @@
   return ui::NativeThemeAura::instance();
 }
 
 }  // namespace
 
 ChromeBrowserMainExtraPartsViewsLinux::ChromeBrowserMainExtraPartsViewsLinux() {
 }
 
 ChromeBrowserMainExtraPartsViewsLinux::
     ~ChromeBrowserMainExtraPartsViewsLinux() {
+#if defined(USE_X11)
   // X11DesktopHandler is destructed at this point, so we don't need to remove
   // ourselves as an X11DesktopHandlerObserver
   DCHECK(!aura::Env::GetInstanceDontCreate());
+#endif
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::PreEarlyInitialization() {
+#if !defined(USE_OZONE)
   // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
   views::LinuxUI* gtk2_ui = BuildGtk2UI();
   gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
   views::LinuxUI::SetInstance(gtk2_ui);
+#endif
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
   ChromeBrowserMainExtraPartsViews::ToolkitInitialized();
+#if !defined(USE_OZONE)
   views::LinuxUI::instance()->Initialize();
+#endif
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::PreCreateThreads() {
   ChromeBrowserMainExtraPartsViews::PreCreateThreads();
+#if !defined(USE_OZONE)
   views::LinuxUI::instance()->UpdateDeviceScaleFactor(
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
+#endif
 
+#if defined(USE_X11)
   views::X11DesktopHandler::get()->AddObserver(this);
+#endif
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::PreProfileInit() {
   ChromeBrowserMainExtraPartsViews::PreProfileInit();
   // On the Linux desktop, we want to prevent the user from logging in as root,
   // so that we don't destroy the profile. Now that we have some minimal ui
   // initialized, check to see if we're running as root and bail if we are.
   if (getuid() != 0)
     return;
 
@@ skipping 13 matching lines @@
   // per_compositor_data_.empty() when quit is chosen.
   base::RunLoop().RunUntilIdle();
 
   exit(EXIT_FAILURE);
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::OnWorkspaceChanged(
     const std::string& new_workspace) {
   BrowserList::MoveBrowsersInWorkspaceToFront(new_workspace);
 }