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

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

Issue 10883008: Port the Extension Install Bubble changes to Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm
===================================================================
--- chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm (revision 153463)
+++ chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm (working copy)
@@ -176,9 +176,10 @@
int height = [controller calculateWindowHeight];
// Height should equal the vertical padding + height of all messages.
int correctHeight = 2 * extension_installed_bubble::kOuterVerticalMargin +
- extension_installed_bubble::kInnerVerticalMargin +
+ 2 * extension_installed_bubble::kInnerVerticalMargin +
[controller getExtensionInstalledMsgFrame].size.height +
- [controller getExtensionInstalledInfoMsgFrame].size.height;
+ [controller getExtensionInstalledInfoMsgFrame].size.height +
+ [controller getExtraInfoMsgFrame].size.height;
EXPECT_EQ(height, correctHeight);
[controller setMessageFrames:height];
@@ -186,12 +187,16 @@
// Bottom message should start kOuterVerticalMargin pixels above window edge.
EXPECT_EQ(msg3Frame.origin.y,
extension_installed_bubble::kOuterVerticalMargin);
+ NSRect msg2Frame = [controller getExtraInfoMsgFrame];
+ // Pageaction message should be kInnerVerticalMargin pixels above bottom msg.
+ EXPECT_EQ(msg2Frame.origin.y,
Nico 2012/08/27 19:08:41 NSMinY(msg2Frame)
+ msg3Frame.origin.y + msg3Frame.size.height +
Nico 2012/08/27 19:08:41 NSMaxY(msg3Frame)
+ extension_installed_bubble::kInnerVerticalMargin);
NSRect msg1Frame = [controller getExtensionInstalledMsgFrame];
- // Top message should start kInnerVerticalMargin pixels above top of
- // extensionInstalled message, because page action message is hidden.
+ // Top message should be kInnerVerticalMargin pixels above BrowserAction msg.
EXPECT_EQ(msg1Frame.origin.y,
Nico 2012/08/27 19:08:41 same
- msg3Frame.origin.y + msg3Frame.size.height +
- extension_installed_bubble::kInnerVerticalMargin);
+ msg2Frame.origin.y + msg2Frame.size.height +
Nico 2012/08/27 19:08:41 same
+ extension_installed_bubble::kInnerVerticalMargin);
[controller close];
}

Powered by Google App Engine
This is Rietveld 408576698