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

Unified Diff: chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm

Issue 1162393003: Replace info_bubble::BubbleArrowLocation with views::BubbleBorder::Arrow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile in test Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
index fd2d5adb09112dc9bed4ef90d98e774ee932084f..230ffcff89c38bb1d8084ec16e5f0cf100d881b9 100644
--- a/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
@@ -153,7 +153,7 @@ class BaseBubbleControllerTest : public CocoaTest {
// Test that kAlignEdgeToAnchorEdge and a left bubble arrow correctly aligns the
// left edge of the buble to the anchor point.
TEST_F(BaseBubbleControllerTest, LeftAlign) {
- [[controller_ bubble] setArrowLocation:info_bubble::kTopLeft];
+ [[controller_ bubble] setArrowLocation:views::BubbleBorder::TOP_LEFT];
[[controller_ bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
[controller_ showWindow:nil];
@@ -169,7 +169,7 @@ TEST_F(BaseBubbleControllerTest, LeftAlign) {
// Test that kAlignEdgeToAnchorEdge and a right bubble arrow correctly aligns
// the right edge of the buble to the anchor point.
TEST_F(BaseBubbleControllerTest, RightAlign) {
- [[controller_ bubble] setArrowLocation:info_bubble::kTopRight];
+ [[controller_ bubble] setArrowLocation:views::BubbleBorder::TOP_RIGHT];
[[controller_ bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
[controller_ showWindow:nil];
@@ -185,7 +185,7 @@ TEST_F(BaseBubbleControllerTest, RightAlign) {
// Test that kAlignArrowToAnchor and a left bubble arrow correctly aligns
// the bubble arrow to the anchor point.
TEST_F(BaseBubbleControllerTest, AnchorAlignLeftArrow) {
- [[controller_ bubble] setArrowLocation:info_bubble::kTopLeft];
+ [[controller_ bubble] setArrowLocation:views::BubbleBorder::TOP_LEFT];
[[controller_ bubble] setAlignment:info_bubble::kAlignArrowToAnchor];
[controller_ showWindow:nil];
@@ -202,7 +202,7 @@ TEST_F(BaseBubbleControllerTest, AnchorAlignLeftArrow) {
// Test that kAlignArrowToAnchor and a right bubble arrow correctly aligns
// the bubble arrow to the anchor point.
TEST_F(BaseBubbleControllerTest, AnchorAlignRightArrow) {
- [[controller_ bubble] setArrowLocation:info_bubble::kTopRight];
+ [[controller_ bubble] setArrowLocation:views::BubbleBorder::TOP_RIGHT];
[[controller_ bubble] setAlignment:info_bubble::kAlignArrowToAnchor];
[controller_ showWindow:nil];
@@ -219,7 +219,7 @@ TEST_F(BaseBubbleControllerTest, AnchorAlignRightArrow) {
// Test that kAlignArrowToAnchor and a center bubble arrow correctly align
// the bubble towards the anchor point.
TEST_F(BaseBubbleControllerTest, AnchorAlignCenterArrow) {
- [[controller_ bubble] setArrowLocation:info_bubble::kTopCenter];
+ [[controller_ bubble] setArrowLocation:views::BubbleBorder::TOP_CENTER];
[[controller_ bubble] setAlignment:info_bubble::kAlignArrowToAnchor];
[controller_ showWindow:nil];
@@ -236,7 +236,8 @@ TEST_F(BaseBubbleControllerTest, AnchorAlignCenterArrow) {
// ensures offscreen initialization is done using correct screen metrics.
TEST_F(BaseBubbleControllerTest, PositionedBeforeShow) {
// Verify default alignment settings, used when initialized in SetUp().
- EXPECT_EQ(info_bubble::kTopRight, [[controller_ bubble] arrowLocation]);
+ EXPECT_EQ(views::BubbleBorder::TOP_RIGHT,
+ [[controller_ bubble] arrowLocation]);
EXPECT_EQ(info_bubble::kAlignArrowToAnchor, [[controller_ bubble] alignment]);
// Verify the default frame (positioned relative to the test_window() origin).
« no previous file with comments | « chrome/browser/ui/cocoa/base_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698