Aura under Linux

chrome/browser/renderer_preferences_util.cc

Index: chrome/browser/renderer_preferences_util.cc
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index a585d4382323a804e427acfe2a110f4c7ff8584f..c37ea5dc5aceb7f0d43529aad0c58859e3d1b609 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
@@ -16,10 +16,10 @@
 namespace renderer_preferences_util {
 
 void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) {
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
   gtk_util::UpdateGtkFontSettings(prefs);
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(USE_AURA)

[sadrul, 2011/09/16 21:11:58]

This change isn't necessary?

[Emmanuel Saint-loubert-Bié, 2011/09/16 22:55:01]

If we build the browser without ChromeOS and with use_aura we do not want the
GTK-ness below. I do not think we can change this.

   GtkThemeService* theme_service = GtkThemeService::GetFrom(profile);
 
   prefs->focus_ring_color = theme_service->get_focus_ring_color();
@@ -40,9 +40,9 @@ void UpdateFromSystemSettings(RendererPreferences* prefs, Profile* profile) {
   prefs->active_selection_fg_color = SK_ColorBLACK;
   prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
   prefs->inactive_selection_fg_color = SK_ColorBLACK;
-#endif  // defined(OS_CHROMEOS)
+#endif  // defined(OS_CHROMEOS) && defined(USE_AURA)
 
-#endif  // defined(TOOLKIT_USES_GTK)
+#endif  // defined(TOOLKIT_USES_GTK) && defined(USE_AURA)
 
   prefs->enable_referrers =
       profile->GetPrefs()->GetBoolean(prefs::kEnableReferrers);