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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.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: deps 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
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
index 9f877c151d39e3dd476178b0608b504ae9d4a428..f44098dfcd8f868cf4adc8772ce31200f6f256d9 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm
@@ -9,8 +9,10 @@
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "grit/ui_resources_standard.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/mac/nsimage_cache.h"
@@ -63,8 +65,9 @@ TEST_F(BookmarkButtonCellTest, IconOnlySqueeze) {
[view setCell:cell.get()];
[[test_window() contentView] addSubview:view];
+ ResourceBundle& rb = ResourceBundle::GetSharedInstance();
scoped_nsobject<NSImage> image(
- [gfx::GetCachedImageWithName(@"nav.pdf") retain]);
+ [rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON) retain]);
EXPECT_TRUE(image.get());
NSRect r = NSMakeRect(0, 0, 100, 100);

Powered by Google App Engine
This is Rietveld 408576698