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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/history_menu_bridge.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/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/tab_contents/favicon_util.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/history_menu_bridge.mm
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm
index e998250dfa8e85221cbe108389a442d15a1c1c46..511058a29ec032b7bd0ad0641473cdb69ac6b9b4 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -25,7 +25,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_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 "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util.h"
@@ -99,7 +99,7 @@ HistoryMenuBridge::HistoryMenuBridge(Profile* profile)
}
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- default_favicon_.reset([gfx::GetCachedImageWithName(@"nav.pdf") retain]);
+ default_favicon_.reset([rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
// Set the static icons in the menu.
NSMenuItem* item = [HistoryMenu() itemWithTag:IDC_SHOW_HISTORY];
« chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/tab_contents/favicon_util.mm » ('j') | chrome/browser/ui/cocoa/tab_contents/favicon_util.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698