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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 10662041: mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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
« chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm ('K') | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm » ('j') | chrome/browser/ui/cocoa/tab_contents/favicon_util.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 9fe0031d7d0cb940bf8753f894bd8b3e0aef5143..b517c9ebc0e0b7de1b25de848210fd0829b80694 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -49,7 +49,7 @@
#include "content/public/browser/web_contents_view.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources_standard.h"
-#include "grit/ui_resources.h"
+#include "grit/ui_resources_standard.h"
#include "skia/ext/skia_utils_mac.h"
#include "ui/base/l10n/l10n_util_mac.h"
#include "ui/base/resource/resource_bundle.h"
@@ -251,7 +251,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
folderImage_.reset(
[rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]);
- defaultImage_.reset([gfx::GetCachedImageWithName(@"nav.pdf") retain]);
+ defaultImage_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
// Register for theme changes, bookmark button pulsing, ...
NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
« chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm ('K') | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm » ('j') | chrome/browser/ui/cocoa/tab_contents/favicon_util.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698