gtk/bookmarks: Display bookmark folder icon on Bookmarks menu.

chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.h"
 
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 
 using content::OpenURLParams;
 using content::PageNavigator;
 
 // Per chrome/app/chrome_command_ids.h, values < 4000 are for "dynamic menu
 // items". We only use one command id for all the bookmarks, because we handle
 // bookmark item activations directly. So we pick a suitably large random value
 // and use that to avoid accidental conflicts with other dynamic items.
 static const int kBookmarkItemCommandId = 1759;
@@ skipping 64 matching lines @@
   // Ironically the label will end up getting converted back to UTF8 later.
   // We need to escape any Windows-style "&" characters since they will be
   // converted in MenuGtk outside of our control here.
   const string16 label = UTF8ToUTF16(ui::EscapeWindowsStyleAccelerators(
       bookmark_utils::BuildMenuLabelFor(node)));
   // Don't pass in the delegate, if any. Bookmark submenus don't need one.
   BookmarkNodeMenuModel* submenu =
       new BookmarkNodeMenuModel(NULL, model_, node, page_navigator_);
   // No command id. Nothing happens if you click on the submenu itself.
   AddSubMenu(kBookmarkItemCommandId, label, submenu);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  const gfx::Image& folder_icon = rb.GetImageNamed(IDR_BOOKMARK_BAR_FOLDER);
+  SetIcon(GetItemCount() - 1, folder_icon);
   submenus_.push_back(submenu);
 }
 
 void BookmarkNodeMenuModel::NavigateToMenuItem(
     int index,
     WindowOpenDisposition disposition) {
   const BookmarkNode* node = node_->GetChild(index);
   DCHECK(node);
   page_navigator_->OpenURL(OpenURLParams(
       node->url(), content::Referrer(), disposition,
@@ skipping 105 matching lines @@
 
 bool BookmarkSubMenuModel::IsVisibleAt(int index) const {
   // We don't want the delegate interfering with bookmark items.
   return index >= fixed_items_ || SimpleMenuModel::IsVisibleAt(index);
 }
 
 // static
 bool BookmarkSubMenuModel::IsBookmarkItemCommandId(int command_id) {
   return command_id == kBookmarkItemCommandId;
 }