Lands http://codereview.chromium.org/203029 for Thiago:...

chrome/browser/views/bookmark_menu_button.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/views/bookmark_menu_button.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_GTK)
 #include <gtk/gtk.h>
 #endif
 
+#include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
-#include "app/os_exchange_data.h"
+#include "app/theme_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "grit/theme_resources.h"
 #include "views/widget/widget.h"
 
 BookmarkMenuButton::BookmarkMenuButton(Browser* browser)
     : views::MenuButton(NULL, std::wstring(), NULL, false),
       browser_(browser),
       bookmark_drop_menu_(NULL),
       drop_operation_(0) {
   set_menu_delegate(this);
   SetID(VIEW_ID_BOOKMARK_MENU);
 
-  ResourceBundle &rb = ResourceBundle::GetSharedInstance();
-  // TODO (sky): if we keep this code, we need real icons, a11y support, and a
+  ThemeProvider* tp = browser_->profile()->GetThemeProvider();
+  // TODO(sky): if we keep this code, we need real icons, a11y support, and a
   // tooltip.
-  SetIcon(*rb.GetBitmapNamed(IDR_MENU_BOOKMARK));
+  SetIcon(*tp->GetBitmapNamed(IDR_MENU_BOOKMARK));
 }
 
 BookmarkMenuButton::~BookmarkMenuButton() {
   if (bookmark_drop_menu_)
     bookmark_drop_menu_->set_observer(NULL);
 }
 
 bool BookmarkMenuButton::GetDropFormats(
       int* formats,
       std::set<OSExchangeData::CustomFormat>* custom_formats) {
@@ skipping 117 matching lines @@
                               this, &BookmarkMenuButton::ShowDropMenu);
 }
 
 void BookmarkMenuButton::StopShowFolderDropMenuTimer() {
   show_drop_menu_timer_.Stop();
 }
 
 void BookmarkMenuButton::ShowDropMenu() {
   RunMenu(NULL, gfx::Point(), GetWidget()->GetNativeView(), true);
 }