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

Unified Diff: chrome/browser/themes/theme_service_aurax11.cc

Issue 23922007: Merge the LinuxUI interface from its own .so into libviews.so. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
« no previous file with comments | « chrome/browser/download/download_status_updater.cc ('k') | chrome/browser/themes/theme_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service_aurax11.cc
diff --git a/chrome/browser/themes/theme_service_aurax11.cc b/chrome/browser/themes/theme_service_aurax11.cc
index 96518b246871688882d61033e321ca138230e296..6dad99d8f88cdc2b3d45d253129a38c7276f9b5c 100644
--- a/chrome/browser/themes/theme_service_aurax11.cc
+++ b/chrome/browser/themes/theme_service_aurax11.cc
@@ -10,7 +10,7 @@
#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 {
@@ -29,7 +29,7 @@ class NativeThemeX11 : public CustomThemeSupplier {
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);
@@ -37,7 +37,7 @@ class NativeThemeX11 : public CustomThemeSupplier {
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() {
« no previous file with comments | « chrome/browser/download/download_status_updater.cc ('k') | chrome/browser/themes/theme_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698