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

Side by Side Diff: chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm

Issue 288005: First fix to minimize copying of image data. (Closed)
Patch Set: Modify gyp Created 11 years, 2 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "app/theme_provider.h" 7 #include "app/theme_provider.h"
8 #include "base/scoped_nsobject.h" 8 #include "base/scoped_nsobject.h"
9 #include "chrome/browser/browser_theme_provider.h" 9 #include "chrome/browser/browser_theme_provider.h"
10 #import "chrome/browser/cocoa/bookmark_bar_controller.h" 10 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
(...skipping 15 matching lines...) Expand all
26 // theme data. 26 // theme data.
27 class MockThemeProvider : public ThemeProvider { 27 class MockThemeProvider : public ThemeProvider {
28 public: 28 public:
29 // Cross platform methods 29 // Cross platform methods
30 MOCK_METHOD1(Init, void(Profile*)); 30 MOCK_METHOD1(Init, void(Profile*));
31 MOCK_CONST_METHOD1(GetBitmapNamed, SkBitmap*(int)); 31 MOCK_CONST_METHOD1(GetBitmapNamed, SkBitmap*(int));
32 MOCK_CONST_METHOD1(GetColor, SkColor(int)); 32 MOCK_CONST_METHOD1(GetColor, SkColor(int));
33 MOCK_CONST_METHOD2(GetDisplayProperty, bool(int, int*)); 33 MOCK_CONST_METHOD2(GetDisplayProperty, bool(int, int*));
34 MOCK_CONST_METHOD0(ShouldUseNativeFrame, bool()); 34 MOCK_CONST_METHOD0(ShouldUseNativeFrame, bool());
35 MOCK_CONST_METHOD1(HasCustomImage, bool(int)); 35 MOCK_CONST_METHOD1(HasCustomImage, bool(int));
36 MOCK_CONST_METHOD2(GetRawData, bool(int, std::vector<unsigned char>*)); 36 MOCK_CONST_METHOD1(GetRawData, RefCountedMemory*(int));
37 37
38 // OSX stuff 38 // OSX stuff
39 MOCK_CONST_METHOD1(GetNSImageNamed, NSImage*(int)); 39 MOCK_CONST_METHOD1(GetNSImageNamed, NSImage*(int));
40 MOCK_CONST_METHOD1(GetNSColor, NSColor*(int)); 40 MOCK_CONST_METHOD1(GetNSColor, NSColor*(int));
41 MOCK_CONST_METHOD1(GetNSColorTint, NSColor*(int)); 41 MOCK_CONST_METHOD1(GetNSColorTint, NSColor*(int));
42 }; 42 };
43 43
44 // Allows us to inject our fake controller below. 44 // Allows us to inject our fake controller below.
45 @interface BookmarkBarToolbarView (TestingAPI) 45 @interface BookmarkBarToolbarView (TestingAPI)
46 -(void)setController:(id<BookmarkBarToolbarViewController>)controller; 46 -(void)setController:(id<BookmarkBarToolbarViewController>)controller;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 fake_bg.allocPixels(); 152 fake_bg.allocPixels();
153 fake_bg.eraseColor(SK_ColorGREEN); 153 fake_bg.eraseColor(SK_ColorGREEN);
154 EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND)) 154 EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND))
155 .WillRepeatedly(Return(&fake_bg)); 155 .WillRepeatedly(Return(&fake_bg));
156 156
157 [controller_.get() setThemeProvider:&provider]; 157 [controller_.get() setThemeProvider:&provider];
158 [controller_.get() setCurrentTabContentsHeight:200]; 158 [controller_.get() setCurrentTabContentsHeight:200];
159 159
160 [view_ display]; 160 [view_ display];
161 } 161 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698