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

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 73083004: Linux: respect use_gconf in Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/ui/libgtk2ui/gtk2_ui.h ('k') | chrome/browser/ui/libgtk2ui/libgtk2ui.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/gtk2_ui.cc
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
index 2555bada1d214d9ff6da221afcfd31e0fd94964b..a7b18399d9303699129faaaa6b194bfe20bf059e 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/themes/theme_properties.h"
#include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"
#include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"
-#include "chrome/browser/ui/libgtk2ui/gconf_titlebar_listener.h"
#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
#include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
#include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
@@ -38,6 +37,10 @@
#include "ui/gfx/skia_util.h"
#include "ui/views/linux_ui/window_button_order_observer.h"
+#if defined(USE_GCONF)
+#include "chrome/browser/ui/libgtk2ui/gconf_titlebar_listener.h"
+#endif
+
// A minimized port of GtkThemeService into something that can provide colors
// and images for aura.
//
@@ -330,8 +333,10 @@ void Gtk2UI::Initialize() {
LoadGtkValues();
SetXDGIconTheme();
+#if defined(USE_GCONF)
// We must build this after GTK gets initialized.
titlebar_listener_.reset(new GConfTitlebarListener(this));
+#endif // defined(USE_GCONF)
indicators_count = 0;
}
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.h ('k') | chrome/browser/ui/libgtk2ui/libgtk2ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698