Make web intents picker work as constrained dialog instead of InfoBubble

chrome/browser/ui/cocoa/web_intent_bubble_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/web_intent_bubble_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
@@ skipping 55 matching lines @@
 @interface WebIntentsContentView : NSView
 @end
 @implementation WebIntentsContentView
 - (BOOL)isFlipped {
   return YES;
 }
 @end
 
 @implementation WebIntentBubbleController;
 
-- (id)initWithPicker:(WebIntentPickerCocoa*)picker
-        parentWindow:(NSWindow*)parent
-          anchoredAt:(NSPoint)point {
+- (id)initWithPicker:(WebIntentPickerCocoa*)picker {
   // Use an arbitrary height because it will reflect the size of the content.
   NSRect contentRect = NSMakeRect(0, 0, kWindowWidth, kVerticalSpacing);
-  // Create an empty window into which content is placed.
-  scoped_nsobject<InfoBubbleWindow> window(
-      [[InfoBubbleWindow alloc] initWithContentRect:contentRect
-                                          styleMask:NSBorderlessWindowMask
-                                            backing:NSBackingStoreBuffered
-                                              defer:NO]);
-  if ((self = [super initWithWindow:window.get()
-                       parentWindow:parent
-                         anchoredAt:point])) {
+
+  // |window| is retained by the ConstrainedWindowMacDelegateCustomSheet when
+  // the sheet is initialized.
+  scoped_nsobject<NSWindow> window;
+  window.reset(

[Nico, 2012/03/03 06:13:49]

Use scoped_ptr's constructor to set the pointer instead of empty constructor +
reset()

[groby-ooo-7-16, 2012/03/03 23:41:49]

Done.

+      [[NSWindow alloc] initWithContentRect:contentRect
+                                  styleMask:NSTitledWindowMask
+                                    backing:NSBackingStoreBuffered
+                                      defer:YES]);
+
+  if ((self = [super initWithWindow:window.get()])) {
     picker_ = picker;
+    [self performLayoutWithModel:NULL];
+  }
+  return self;
+}
 
-    [[self bubble] setArrowLocation:info_bubble::kTopLeft];
-    [self performLayoutWithModel:NULL];
-    [self showWindow:nil];
-    picker_->set_controller(self);
-  }
-
-  return self;
+- (void)sheetDidEnd:(NSWindow*)sheet
+         returnCode:(int)returnCode
+        contextInfo:(void *)contextInfo {
+  // Also called when user navigates to another page while the sheet is open.

[Nico, 2012/03/03 06:13:49]

No space in front of *

[groby-ooo-7-16, 2012/03/03 23:41:49]

Done.

+  if (picker_)
+    picker_->OnSheetDidEnd(sheet);
 }
 
 - (void)setInlineDispositionTabContents:(TabContentsWrapper*)wrapper {
   contents_ = wrapper;
 }
 
-// We need to watch for window closing so we can notify up via |picker_|.
-- (void)windowWillClose:(NSNotification*)notification {
-  if (picker_) {
-    WebIntentPickerCocoa* temp = picker_;
-    picker_ = NULL;  // Abandon picker, we are done with it.
-    temp->OnCancelled();
-  }
-  [super windowWillClose:notification];
-}
-
 // Pop up a new tab with the Chrome Web Store.
 - (IBAction)showChromeWebStore:(id)sender {
   GURL url(l10n_util::GetStringUTF8(IDS_WEBSTORE_URL));
   Browser* browser = BrowserList::GetLastActive();
   OpenURLParams params(
       url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
       false);
   browser->OpenURL(params);
 }
 
@@ skipping 87 matching lines @@
       contents_->web_contents());
   NSRect frame = NSMakeRect(kFramePadding, offset, size.width(), size.height());
 
   [contents_->web_contents()->GetNativeView() setFrame:frame];
   [subviews addObject:contents_->web_contents()->GetNativeView()];
 
   return NSHeight(frame);
 }
 
 // Add a single button for a specific service
--(CGFloat)addServiceButton:(NSString*)title
+- (CGFloat)addServiceButton:(NSString*)title
                  withImage:(NSImage*)image
                      index:(NSUInteger)index
                 toSubviews:(NSMutableArray*)subviews
                   atOffset:(CGFloat)offset {
   NSRect frame = NSMakeRect(kFramePadding, offset, kServiceButtonWidth, 45);
   scoped_nsobject<NSButton> button([[NSButton alloc] initWithFrame:frame]);
 
   if (image) {
     [button setImage:image];
     [button setImagePosition:NSImageLeft];
@@ skipping 13 matching lines @@
   frame = [button frame];
   frame.size.width = kServiceButtonWidth;
   [button setFrame:frame];
 
   return NSHeight([button frame]);
 }
 
 // Layout the contents of the picker bubble.
 - (void)performLayoutWithModel:(WebIntentPickerModel*)model {
   // |offset| is the Y position that should be drawn at next.
-  CGFloat offset = kFramePadding + info_bubble::kBubbleArrowHeight;
+  CGFloat offset = kFramePadding;
 
   // Keep the new subviews in an array that gets replaced at the end.
   NSMutableArray* subviews = [NSMutableArray array];
 
   if (contents_) {
     offset += [self addInlineHtmlToSubviews:subviews atOffset:offset];
   } else {
     offset += [self addHeaderToSubviews:subviews atOffset:offset];
     if (model) {
       for (NSUInteger i = 0; i < model->GetInstalledServiceCount(); ++i) {
@@ skipping 16 matching lines @@
   NSRect contentFrame = NSMakeRect(0, 0, kWindowWidth, offset);
   scoped_nsobject<WebIntentsContentView> contentView(
       [[WebIntentsContentView alloc] initWithFrame:contentFrame]);
   [contentView setSubviews:subviews];
   [contentView setAutoresizingMask:NSViewMinYMargin];
 
   // Adjust frame to fit all elements.
   NSRect windowFrame = NSMakeRect(0, 0, kWindowWidth, offset);
   windowFrame.size = [[[self window] contentView] convertSize:windowFrame.size
                                                        toView:nil];
-  // Adjust the origin by the difference in height.
-  windowFrame.origin = [[self window] frame].origin;
-  windowFrame.origin.y -= NSHeight(windowFrame) -
-      NSHeight([[self window] frame]);
 
+    // Adjust the window frame to accomodate the content.
+    windowFrame=[[self window] frameRectForContentRect:windowFrame];

[Nico, 2012/03/03 06:13:49]

indent looks off

[groby-ooo-7-16, 2012/03/03 23:41:49]

Done.

   [[self window] setFrame:windowFrame display:YES animate:YES];
 
   // Replace the window's content.
   [[[self window] contentView] setSubviews:
       [NSArray arrayWithObject:contentView]];
 }
 
+- (void)closeSheet {
+  [NSApp endSheet:[self window]];
+}
 @end  // WebIntentBubbleController