Misc. cleanup for theme provider code, including:...

chrome/browser/gtk/gtk_theme_provider.cc

 // Copyright (c) 2009 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/gtk/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
 #include "app/gfx/color_utils.h"
 #include "app/gfx/gtk_util.h"
@@ skipping 109 matching lines @@
 void GtkThemeProvider::SetNativeTheme() {
   profile()->GetPrefs()->SetBoolean(prefs::kUsesSystemTheme, true);
   ClearAllThemeData();
   LoadGtkValues();
   NotifyThemeChanged();
 }
 
 void GtkThemeProvider::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
-  if (type == NotificationType::PREF_CHANGED) {
-    std::wstring key = *Details<std::wstring>(details).ptr();
-    if (key == prefs::kUsesSystemTheme) {
-      use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
-    }
-  }
+  if ((type == NotificationType::PREF_CHANGED) &&
+      (*Details<std::wstring>(details).ptr() == prefs::kUsesSystemTheme))
+    use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
 }
 
 GtkWidget* GtkThemeProvider::BuildChromeButton() {
   GtkWidget* button = gtk_chrome_button_new();
   gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(button), use_gtk_);
   chrome_buttons_.push_back(button);
 
   g_signal_connect(button, "destroy", G_CALLBACK(OnDestroyChromeButton),
                    this);
   return button;
@@ skipping 115 matching lines @@
   if (use_gtk_) {
     if (id == IDR_THEME_TOOLBAR) {
       GtkStyle* style = gtk_rc_get_style(fake_window_);
       GdkColor* color = &style->bg[GTK_STATE_NORMAL];
       SkBitmap* bitmap = new SkBitmap;
       bitmap->setConfig(SkBitmap::kARGB_8888_Config,
                         kToolbarImageWidth, kToolbarImageHeight);
       bitmap->allocPixels();
       bitmap->eraseRGB(color->red >> 8, color->green >> 8, color->blue >> 8);
       return bitmap;
-    } else if ((id == IDR_THEME_TAB_BACKGROUND ||
-                id == IDR_THEME_TAB_BACKGROUND_INCOGNITO)) {
+    }
+    if ((id == IDR_THEME_TAB_BACKGROUND) ||
+        (id == IDR_THEME_TAB_BACKGROUND_INCOGNITO))
       return GenerateTabBackgroundBitmapImpl(id);
-    }
   }
 
   return BrowserThemeProvider::LoadThemeBitmap(id);
 }
 
 void GtkThemeProvider::SaveThemeBitmap(const std::string resource_name,
                                        int id) {
   if (!use_gtk_) {
     // Prevent us from writing out our mostly unused resources in gtk theme
     // mode. Simply preventing us from writing this data out in gtk mode isn't
@@ skipping 189 matching lines @@
 }
 
 void GtkThemeProvider::OnDestroyChromeButton(GtkWidget* button,
                                              GtkThemeProvider* provider) {
   std::vector<GtkWidget*>::iterator it =
       find(provider->chrome_buttons_.begin(), provider->chrome_buttons_.end(),
            button);
   if (it != provider->chrome_buttons_.end())
     provider->chrome_buttons_.erase(it);
 }