Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(934)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

Issue 328363003: Use the managed bookmarks icon for its folder in views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 3a4d1f89550f02fcf5a8eca1c2ffe8c3ed60a5fa..0595d466950311a4ccb8e807b4c90434e31cb76b 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1309,7 +1309,7 @@ void BookmarkBarView::Init() {
other_bookmarked_button_->SetEnabled(false);
AddChildView(other_bookmarked_button_);
- managed_bookmarks_button_ = CreateOtherBookmarkedButton();
+ managed_bookmarks_button_ = CreateManagedBookmarksButton();
// Also re-enabled when the model is loaded.
managed_bookmarks_button_->SetEnabled(false);
AddChildView(managed_bookmarks_button_);
@@ -1393,9 +1393,10 @@ MenuButton* BookmarkBarView::CreateManagedBookmarksButton() {
MenuButton* button =
new BookmarkFolderButton(this, base::string16(), this, false);
button->set_id(VIEW_ID_MANAGED_BOOKMARKS);
- // TODO(joaodasilva): replace with a "managed folder" icon.
- // http://crbug.com/49598
- button->SetIcon(GetFolderIcon());
+ ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
+ gfx::ImageSkia* image =
+ rb->GetImageSkiaNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED);
+ button->SetIcon(*image);
button->set_context_menu_controller(this);
button->set_tag(kManagedFolderButtonTag);
return button;

Powered by Google App Engine
This is Rietveld 408576698