chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm - Issue 3173043: Move theme files in chrome/browser/ into a themes/ subdir.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 3173043: Move theme files in chrome/browser/ into a themes/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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

« chrome/browser/cocoa/bookmark_bar_folder_controller.mm ('K') | « chrome/browser/cocoa/bookmark_bar_toolbar_view.mm ('k') | chrome/browser/cocoa/bookmark_bar_view.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

10 #import "chrome/browser/cocoa/bookmark_bar_controller.h"	9 #import "chrome/browser/cocoa/bookmark_bar_controller.h"

11 #import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h"	10 #import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h"

12 #import "chrome/browser/cocoa/cocoa_test_helper.h"	11 #import "chrome/browser/cocoa/cocoa_test_helper.h"

	12 #include "chrome/browser/themes/browser_theme_provider.h"

13 #include "grit/theme_resources.h"	13 #include "grit/theme_resources.h"

14 #include "testing/gmock/include/gmock/gmock.h"	14 #include "testing/gmock/include/gmock/gmock.h"

15 #include "testing/gtest/include/gtest/gtest.h"	15 #include "testing/gtest/include/gtest/gtest.h"

16 #include "testing/platform_test.h"	16 #include "testing/platform_test.h"

17 #include "third_party/skia/include/core/SkBitmap.h"	17 #include "third_party/skia/include/core/SkBitmap.h"

18 #include "third_party/skia/include/core/SkColor.h"	18 #include "third_party/skia/include/core/SkColor.h"

19	19

20 using ::testing::_;	20 using ::testing::_;

21 using ::testing::DoAll;	21 using ::testing::DoAll;

22 using ::testing::Return;	22 using ::testing::Return;

(...skipping 159 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
182 EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND))	182 EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND))

183 .WillRepeatedly(Return(&fake_bg));	183 .WillRepeatedly(Return(&fake_bg));

184	184

185 [controller_.get() setThemeProvider:&provider];	185 [controller_.get() setThemeProvider:&provider];

186 [controller_.get() setCurrentTabContentsHeight:200];	186 [controller_.get() setCurrentTabContentsHeight:200];

187	187

188 [view_ display];	188 [view_ display];

189 }	189 }

190	190

191 // TODO(viettrungluu): write more unit tests, especially after my refactoring.	191 // TODO(viettrungluu): write more unit tests, especially after my refactoring.

OLD	NEW