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

[Windows] Bookmark-menu button should be themed like any other menu button. 
Command: 
$ chrome --bookmark-menu 

BUG=18954
TEST=open chrome/chromium with --bookmark-menu switch in the command line, apply a theme, see if the bookmark-menu 
is themed? Reset to default theme, see if the bookmark-menu come backs
to default state.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/208017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26563 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 9 deletions

diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 12b5182..3b1326c 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -162,6 +162,7 @@ static const int kToolbarButtonIDs[] = {
   IDR_STARRED_P,
   IDR_GO, IDR_GO_NOBORDER, IDR_GO_NOBORDER_CENTER, IDR_GO_H, IDR_GO_P,
   IDR_STOP, IDR_STOP_NOBORDER, IDR_STOP_NOBORDER_CENTER, IDR_STOP_H, IDR_STOP_P,
+  IDR_MENU_BOOKMARK,
   IDR_MENU_PAGE, IDR_MENU_PAGE_RTL,
   IDR_MENU_CHROME, IDR_MENU_CHROME_RTL,
   IDR_MENU_DROPARROW,
diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc
index 577189e..e3475aa 100644
--- a/chrome/browser/views/bookmark_menu_button.cc
+++ b/chrome/browser/views/bookmark_menu_button.cc
@@ -10,8 +10,9 @@
 #include <gtk/gtk.h>
 #endif
 
-#include "app/resource_bundle.h"
 #include "app/os_exchange_data.h"
+#include "app/resource_bundle.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"
@@ -29,10 +30,10 @@ BookmarkMenuButton::BookmarkMenuButton(Browser* browser)
   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() {
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index b32a608..62221b4 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -867,17 +867,17 @@ void ToolbarView::CreateRightSideControls(Profile* profile) {
       l10n_util::GetString(IDS_PRODUCT_NAME)));
   app_menu_->SetID(VIEW_ID_APP_MENU);
 
-  LoadRightSideControlsImages();
-
-  AddChildView(page_menu_);
-  AddChildView(app_menu_);
-
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kBookmarkMenu)) {
     bookmark_menu_ = new BookmarkMenuButton(browser_);
     AddChildView(bookmark_menu_);
   } else {
     bookmark_menu_ = NULL;
   }
+
+  LoadRightSideControlsImages();
+
+  AddChildView(page_menu_);
+  AddChildView(app_menu_);
 }
 
 void ToolbarView::LoadLeftSideControlsImages() {
@@ -969,6 +969,9 @@ void ToolbarView::LoadRightSideControlsImages() {
     app_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_CHROME_RTL));
   else
     app_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_CHROME));
+
+  if (bookmark_menu_ != NULL)
+    bookmark_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_BOOKMARK));
 }
 
 void ToolbarView::RunPageMenu(const gfx::Point& pt, gfx::NativeView parent) {