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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm

Issue 6541031: Integrate gfx::Image into the ResourceBundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add some comments Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/scoped_nsobject.h" 5 #include "base/scoped_nsobject.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/bookmarks/bookmark_model.h" 7 #include "chrome/browser/bookmarks/bookmark_model.h"
8 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" 8 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h" 9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
10 #include "chrome/browser/ui/cocoa/browser_test_helper.h" 10 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
11 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 11 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
12 #include "grit/app_resources.h" 12 #include "grit/app_resources.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "testing/platform_test.h" 14 #include "testing/platform_test.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/gfx/image.h"
16 17
17 // Simple class to remember how many mouseEntered: and mouseExited: 18 // Simple class to remember how many mouseEntered: and mouseExited:
18 // calls it gets. Only used by BookmarkMouseForwarding but placed 19 // calls it gets. Only used by BookmarkMouseForwarding but placed
19 // at the top of the file to keep it outside the anon namespace. 20 // at the top of the file to keep it outside the anon namespace.
20 @interface ButtonRemembersMouseEnterExit : NSButton { 21 @interface ButtonRemembersMouseEnterExit : NSButton {
21 @public 22 @public
22 int enters_; 23 int enters_;
23 int exits_; 24 int exits_;
24 } 25 }
25 @end 26 @end
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 EXPECT_GE(size.width, 2); 175 EXPECT_GE(size.width, 2);
175 EXPECT_GE(size.height, 2); 176 EXPECT_GE(size.height, 2);
176 177
177 // Once we turn on arrow drawing make sure there is now room for it. 178 // Once we turn on arrow drawing make sure there is now room for it.
178 [cell setDrawFolderArrow:YES]; 179 [cell setDrawFolderArrow:YES];
179 NSSize arrowSize = [cell cellSize]; 180 NSSize arrowSize = [cell cellSize];
180 EXPECT_GT(arrowSize.width, size.width); 181 EXPECT_GT(arrowSize.width, size.width);
181 } 182 }
182 183
183 } // namespace 184 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698