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

Unified Diff: chrome/browser/ui/cocoa/autofill/autofill_bubble_controller.mm

Issue 84343002: [rAC, OSX] Use a bubble for tooltips. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes. Created 7 years 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/autofill/autofill_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_bubble_controller.mm b/chrome/browser/ui/cocoa/autofill/autofill_bubble_controller.mm
index f33aeceb0727a7f4328b1bee32c6ae314a6036ac..017489576a6190a13f9412d9598868562d06ecf5 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_bubble_controller.mm
@@ -24,6 +24,14 @@ const CGFloat kMaxLabelWidth =
- (id)initWithParentWindow:(NSWindow*)parentWindow
message:(NSString*)message {
+ return [self initWithParentWindow:parentWindow
+ message:message
+ inset:NSMakeSize(kLabelInset, kLabelInset)];
+}
+
+- (id)initWithParentWindow:(NSWindow*)parentWindow
+ message:(NSString*)message
+ inset:(NSSize)inset {
base::scoped_nsobject<InfoBubbleWindow> window(
[[InfoBubbleWindow alloc] initWithContentRect:NSMakeRect(0, 0, 200, 100)
styleMask:NSBorderlessWindowMask
@@ -33,6 +41,7 @@ const CGFloat kMaxLabelWidth =
if ((self = [super initWithWindow:window
parentWindow:parentWindow
anchoredAt:NSZeroPoint])) {
+ inset_ = inset;
[self setShouldOpenAsKeyWindow:NO];
[[self bubble] setArrowLocation:info_bubble::kTopCenter];
[[self bubble] setAlignment:info_bubble::kAlignArrowToAnchor];
@@ -42,7 +51,7 @@ const CGFloat kMaxLabelWidth =
[label_ setBordered:NO];
[label_ setDrawsBackground:NO];
[label_ setStringValue:message];
- NSRect labelFrame = NSMakeRect(kLabelInset, kLabelInset, 0, 0);
+ NSRect labelFrame = NSMakeRect(inset.width, inset.height, 0, 0);
labelFrame.size = [[label_ cell] cellSizeForBounds:
NSMakeRect(0, 0, kMaxLabelWidth, CGFLOAT_MAX)];
[label_ setFrame:labelFrame];
@@ -52,14 +61,14 @@ const CGFloat kMaxLabelWidth =
windowFrame.size = NSMakeSize(
NSMaxX([label_ frame]),
NSHeight([label_ frame]) + info_bubble::kBubbleArrowHeight);
- windowFrame = NSInsetRect(windowFrame, -kLabelInset, -kLabelInset);
+ windowFrame = NSInsetRect(windowFrame, -inset.width, -inset.height);
[[self window] setFrame:windowFrame display:NO];
}
return self;
}
- (CGFloat)maxWidth {
- return kMaxLabelWidth + 2 * kLabelInset;
+ return kMaxLabelWidth + 2 * inset_.width;
}
@end

Powered by Google App Engine
This is Rietveld 408576698