Fix several painting glitches for toolstrips.

chrome/browser/views/bookmark_bar_view.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/views/bookmark_bar_view.h"
 
 #include <limits>
 
 #include "base/string_util.h"
 #include "base/base_drag_source.h"
@@ skipping 1414 matching lines @@
       }
       break;
     }
   }
 }
 
 bool BookmarkBarView::AddExtensionToolstrips(const ExtensionList* extensions) {
   bool added_toolstrip = false;
   for (ExtensionList::const_iterator extension = extensions->begin();
        extension != extensions->end(); ++extension) {
-    for (std::vector<std::string>::const_iterator toolstrip =
+    for (std::vector<std::string>::const_iterator toolstrip_path =
          (*extension)->toolstrips().begin();
-         toolstrip != (*extension)->toolstrips().end(); ++toolstrip) {
-      ExtensionToolstrip* view =
+         toolstrip_path != (*extension)->toolstrips().end(); ++toolstrip_path) {
+      ExtensionToolstrip* toolstrip =
           new ExtensionToolstrip(*extension,
-                                 (*extension)->GetResourceURL(*toolstrip),
+                                 (*extension)->GetResourceURL(*toolstrip_path),
                                  browser_);
       int index = GetBookmarkButtonCount() + num_extension_toolstrips_;
-      view->view()->SetBackground(toolstrip_background_);
-      AddChildView(index, view);
+      if (!toolstrip_background_.empty())
+        toolstrip->view()->SetBackground(toolstrip_background_);
+      AddChildView(index, toolstrip);
       added_toolstrip = true;
       ++num_extension_toolstrips_;
     }
   }
 
   return added_toolstrip;
 }
 
 void BookmarkBarView::RemoveNotificationObservers() {
   NotificationService* ns = NotificationService::current();
@@ skipping 255 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }