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

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm

Issue 2629723005: [Mac] Fix bugs in resizing the browser actions area next to the omnibox. (Closed)
Patch Set: Format Created 3 years, 11 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/extensions/browser_actions_container_view_unittest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm
index dca3226dacd25ed7b79fcfd80413bfd70944e66a..7f26cab0ddc6514dd5607d16970e6426b689164a 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view_unittest.mm
@@ -15,18 +15,6 @@ const CGFloat kContainerHeight = 15.0;
const CGFloat kMinimumContainerWidth = 3.0;
const CGFloat kMaxAllowedWidthForTest = 50.0;
-class BrowserActionsContainerTestDelegate
- : public BrowserActionsContainerViewSizeDelegate {
- public:
- BrowserActionsContainerTestDelegate() {}
- ~BrowserActionsContainerTestDelegate() override {}
-
- CGFloat GetMaxAllowedWidth() override { return kMaxAllowedWidthForTest; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainerTestDelegate);
-};
-
class BrowserActionsContainerViewTest : public CocoaTest {
public:
void SetUp() override {
@@ -39,13 +27,14 @@ class BrowserActionsContainerViewTest : public CocoaTest {
};
TEST_F(BrowserActionsContainerViewTest, BasicTests) {
- EXPECT_TRUE([view_ canDragLeft]);
- EXPECT_TRUE([view_ canDragRight]);
EXPECT_TRUE([view_ isHidden]);
}
TEST_F(BrowserActionsContainerViewTest, SetWidthTests) {
- // Try setting below the minimum width (10 pixels).
+ [view_ setMinWidth:kMinimumContainerWidth];
+ [view_ setMaxWidth:kMaxAllowedWidthForTest];
+
+ // Try setting below the minimum width.
[view_ resizeToWidth:kMinimumContainerWidth - 1 animate:NO];
EXPECT_EQ(kMinimumContainerWidth, NSWidth([view_ frame])) << "Frame width is "
<< "less than the minimum allowed.";
@@ -73,11 +62,8 @@ TEST_F(BrowserActionsContainerViewTest, SetWidthTests) {
EXPECT_EQ(35.0, NSWidth([view_ frame]));
EXPECT_EQ(35.0, NSWidth([view_ animationEndFrame]));
- BrowserActionsContainerTestDelegate delegate;
- [view_ setDelegate:&delegate];
[view_ resizeToWidth:kMaxAllowedWidthForTest + 10.0 animate:NO];
EXPECT_EQ(kMaxAllowedWidthForTest, NSWidth([view_ frame]));
- [view_ setDelegate:nil];
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698