Merge the LinuxUI interface from its own .so into libviews.so.

chrome/browser/themes/theme_service_aurax11.cc

 // Copyright 2013 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/themes/theme_service_aurax11.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/common/pref_names.h"
 #include "ui/gfx/image/image.h"
-#include "ui/linux_ui/linux_ui.h"
+#include "ui/views/linux_ui/linux_ui.h"
 
 namespace {
 
 class NativeThemeX11 : public CustomThemeSupplier {
  public:
   explicit NativeThemeX11(PrefService* pref_service);
 
   // Overridden from CustomThemeSupplier:
   virtual void StartUsingTheme() OVERRIDE;
   virtual void StopUsingTheme() OVERRIDE;
   virtual bool GetColor(int id, SkColor* color) const OVERRIDE;
   virtual gfx::Image GetImageNamed(int id) OVERRIDE;
   virtual bool HasCustomImage(int id) const OVERRIDE;
 
  private:
   virtual ~NativeThemeX11();
 
   // These pointers are not owned by us.
-  const ui::LinuxUI* const linux_ui_;
+  const views::LinuxUI* const linux_ui_;
   PrefService* const pref_service_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeX11);
 };
 
 NativeThemeX11::NativeThemeX11(PrefService* pref_service)
     : CustomThemeSupplier(NATIVE_X11),
-      linux_ui_(ui::LinuxUI::instance()),
+      linux_ui_(views::LinuxUI::instance()),
       pref_service_(pref_service) {}
 
 void NativeThemeX11::StartUsingTheme() {
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, true);
 }
 
 void NativeThemeX11::StopUsingTheme() {
   pref_service_->SetBoolean(prefs::kUsesSystemTheme, false);
 }
 
@@ skipping 27 matching lines @@
 
 bool ThemeServiceAuraX11::UsingDefaultTheme() const {
   return ThemeService::UsingDefaultTheme() && !UsingNativeTheme();
 }
 
 bool ThemeServiceAuraX11::UsingNativeTheme() const {
   const CustomThemeSupplier* theme_supplier = get_theme_supplier();
   return theme_supplier &&
          theme_supplier->get_theme_type() == CustomThemeSupplier::NATIVE_X11;
 }