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

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

Issue 1988223002: [Mac][Material Design] Bring bookmark hover background up to spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. Created 4 years, 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/mac/scoped_nsobject.h" 5 #include "base/mac/scoped_nsobject.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
8 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" 8 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
9 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 9 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
10 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 10 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
11 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
12 #include "components/bookmarks/browser/bookmark_model.h" 12 #include "components/bookmarks/browser/bookmark_model.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/material_design/material_design_controller.h"
15 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/gfx/image/image.h" 17 #include "ui/gfx/image/image.h"
17 #include "ui/resources/grit/ui_resources.h" 18 #include "ui/resources/grit/ui_resources.h"
18 19
19 using bookmarks::BookmarkModel; 20 using bookmarks::BookmarkModel;
20 using bookmarks::BookmarkNode; 21 using bookmarks::BookmarkNode;
21 22
22 // Simple class to remember how many mouseEntered: and mouseExited: 23 // Simple class to remember how many mouseEntered: and mouseExited:
23 // calls it gets. Only used by BookmarkMouseForwarding but placed 24 // calls it gets. Only used by BookmarkMouseForwarding but placed
24 // at the top of the file to keep it outside the anon namespace. 25 // at the top of the file to keep it outside the anon namespace.
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 base::scoped_nsobject<BookmarkButtonCell> bookmark_cell( 195 base::scoped_nsobject<BookmarkButtonCell> bookmark_cell(
195 [[BookmarkButtonCell alloc] initForNode:node 196 [[BookmarkButtonCell alloc] initForNode:node
196 text:@"small" 197 text:@"small"
197 image:nil 198 image:nil
198 menuController:nil]); 199 menuController:nil]);
199 200
200 ASSERT_TRUE(gradient_cell.get()); 201 ASSERT_TRUE(gradient_cell.get());
201 ASSERT_TRUE(bookmark_cell.get()); 202 ASSERT_TRUE(bookmark_cell.get());
202 203
203 EXPECT_EQ(1, [gradient_cell verticalTextOffset]); 204 EXPECT_EQ(1, [gradient_cell verticalTextOffset]);
204 EXPECT_EQ(0, [bookmark_cell verticalTextOffset]); 205 if (ui::MaterialDesignController::IsModeMaterial()) {
206 EXPECT_EQ(-1, [bookmark_cell verticalTextOffset]);
207 } else {
208 EXPECT_EQ(0, [bookmark_cell verticalTextOffset]);
209 }
205 210
206 EXPECT_NE([bookmark_cell verticalTextOffset], 211 EXPECT_NE([bookmark_cell verticalTextOffset],
207 [gradient_cell verticalTextOffset]); 212 [gradient_cell verticalTextOffset]);
208 } 213 }
209 214
210 } // namespace 215 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm ('k') | chrome/browser/ui/cocoa/gradient_button_cell.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698