GTK: First draft of using native themes, partially based on evan's CL 118358.

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 27 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/common/net/cookie_monster_sqlite.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "grit/locale_settings.h"
 #include "net/base/force_tls_state.h"
 
+#if defined(OS_LINUX)
+#include "chrome/browser/gtk/gtk_theme_provider.h"
+#endif
+
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 // Delay, in milliseconds, before we explicitly create the SessionService.
 static const int kCreateSessionServiceDelayMS = 500;
 
 enum ContextType {
   kNormalContext,
@@ skipping 51 matching lines @@
 void Profile::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSearchSuggestEnabled, true);
   prefs->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
   prefs->RegisterBooleanPref(prefs::kSafeBrowsingEnabled, true);
   // TODO(estade): IDS_SPELLCHECK_DICTIONARY should be an ASCII string.
   prefs->RegisterLocalizedStringPref(prefs::kSpellCheckDictionary,
       IDS_SPELLCHECK_DICTIONARY);
   prefs->RegisterBooleanPref(prefs::kEnableSpellCheck, true);
   prefs->RegisterBooleanPref(prefs::kEnableAutoSpellCorrect, true);
   prefs->RegisterBooleanPref(prefs::kEnableUserScripts, false);
+#if defined(OS_LINUX)
+  prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, false);
+#endif
   prefs->RegisterStringPref(prefs::kCurrentThemeID, L"");
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints);
   prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties);
   prefs->RegisterBooleanPref(prefs::kEnableExtensions, false);
 }
 
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
@@ skipping 151 matching lines @@
   }
 
   virtual void InitThemes() {
     GetOriginalProfile()->InitThemes();
   }
 
   virtual void SetTheme(Extension* extension) {
     GetOriginalProfile()->SetTheme(extension);
   }
 
+  virtual void SetNativeTheme() {
+    GetOriginalProfile()->SetNativeTheme();
+  }
+
   virtual void ClearTheme() {
     GetOriginalProfile()->ClearTheme();
   }
 
   virtual ThemeProvider* GetThemeProvider() {
     return GetOriginalProfile()->GetThemeProvider();
   }
 
   virtual URLRequestContext* GetRequestContext() {
     return request_context_;
@@ skipping 615 matching lines @@
   }
   return download_manager_.get();
 }
 
 bool ProfileImpl::HasCreatedDownloadManager() const {
   return created_download_manager_;
 }
 
 void ProfileImpl::InitThemes() {
   if (!created_theme_provider_) {
+#if defined(OS_LINUX)
+    scoped_refptr<BrowserThemeProvider> themes(new GtkThemeProvider);

[tony, 2009/07/07 19:47:05]

Nit: Maybe make a static ::Create method to avoid this #if?

+#else
     scoped_refptr<BrowserThemeProvider> themes(new BrowserThemeProvider);
+#endif
     themes->Init(this);
     created_theme_provider_ = true;
     theme_provider_.swap(themes);
   }
 }
 
 void ProfileImpl::SetTheme(Extension* extension) {
   InitThemes();
   theme_provider_.get()->SetTheme(extension);
 }
 
+void ProfileImpl::SetNativeTheme() {
+  InitThemes();
+  theme_provider_.get()->SetNativeTheme();
+}
+
 void ProfileImpl::ClearTheme() {
   InitThemes();
   theme_provider_.get()->UseDefaultTheme();
 }
 
 ThemeProvider* ProfileImpl::GetThemeProvider() {
   InitThemes();
   return theme_provider_.get();
 }
 
@@ skipping 207 matching lines @@
 
 void ProfileImpl::StopCreateSessionServiceTimer() {
   create_session_service_timer_.Stop();
 }
 
 #ifdef CHROME_PERSONALIZATION
 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
   return personalization_.get();
 }
 #endif