Add a blocking version of the sync promo dialog

chrome/browser/ui/cocoa/html_dialog_window_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/html_dialog_window_controller.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/property_bag.h"
 #include "base/sys_string_conversions.h"
@@ skipping 43 matching lines @@
   virtual std::string GetDialogArgs() const OVERRIDE;
   virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
   virtual void OnCloseContents(WebContents* source,
                                bool* out_close_dialog) OVERRIDE;
   virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; }
 
   // HtmlDialogTabContentsDelegate declarations.
   virtual void MoveContents(WebContents* source, const gfx::Rect& pos);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void CloseContents(WebContents* source) OVERRIDE;
+  virtual content::WebContents* OpenURLFromTab(
+      content::WebContents* source,
+      const content::OpenURLParams& params) OVERRIDE;
+  virtual void AddNewContents(content::WebContents* source,
+                              content::WebContents* new_contents,
+                              WindowOpenDisposition disposition,
+                              const gfx::Rect& initial_pos,
+                              bool user_gesture) OVERRIDE;
 
 private:
   HtmlDialogWindowController* controller_;  // weak
   HtmlDialogUIDelegate* delegate_;  // weak, owned by controller_
   HtmlDialogController* dialog_controller_;
 
   // Calls delegate_'s OnDialogClosed() exactly once, nulling it out
   // afterwards so that no other HtmlDialogUIDelegate calls are sent
   // to it.  Returns whether or not the OnDialogClosed() was actually
   // called on the delegate.
@@ skipping 16 matching lines @@
 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent,
                                  Profile* profile,
                                  Browser* browser,
                                  HtmlDialogUIDelegate* delegate,
                                  DialogStyle style) {
   return [HtmlDialogWindowController showHtmlDialog:delegate
       profile:profile
       browser:browser];
 }
 
+void CloseHtmlDialog(gfx::NativeWindow window) {
+  [window performClose:nil];
+}
+
 }  // namespace html_dialog_window_controller
 
 HtmlDialogWindowDelegateBridge::HtmlDialogWindowDelegateBridge(
     HtmlDialogWindowController* controller,
     Profile* profile,
     Browser* browser,
     HtmlDialogUIDelegate* delegate)
     : HtmlDialogTabContentsDelegate(profile),
       controller_(controller),
       delegate_(delegate),
@@ skipping 83 matching lines @@
     *out_close_dialog = true;
 }
 
 void HtmlDialogWindowDelegateBridge::CloseContents(WebContents* source) {
   bool close_dialog = false;
   OnCloseContents(source, &close_dialog);
   if (close_dialog)
     OnDialogClosed(std::string());
 }
 
+content::WebContents* HtmlDialogWindowDelegateBridge::OpenURLFromTab(
+    content::WebContents* source,
+    const content::OpenURLParams& params) {
+  content::WebContents* new_contents = NULL;
+  if (delegate_ &&
+      delegate_->HandleOpenURLFromTab(source, params, &new_contents)) {
+    return new_contents;
+  }
+  return HtmlDialogTabContentsDelegate::OpenURLFromTab(source, params);
+}
+
+void HtmlDialogWindowDelegateBridge::AddNewContents(
+    content::WebContents* source,
+    content::WebContents* new_contents,
+    WindowOpenDisposition disposition,
+    const gfx::Rect& initial_pos,
+    bool user_gesture) {
+  if (delegate_ && delegate_->HandleAddNewContents(
+      source, new_contents, disposition, initial_pos, user_gesture)) {

[Dan Beam, 2012/01/30 18:10:05]

probably need to indent this + ^\s{4}

[sail, 2012/01/30 21:00:39]

Done.

+    return;
+  }
+  HtmlDialogTabContentsDelegate::AddNewContents(
+      source, new_contents, disposition, initial_pos, user_gesture);
+}
+
 void HtmlDialogWindowDelegateBridge::MoveContents(WebContents* source,
                                                   const gfx::Rect& pos) {
   // TODO(akalin): Actually set the window bounds.
 }
 
 // A simplified version of BrowserWindowCocoa::HandleKeyboardEvent().
 // We don't handle global keyboard shortcuts here, but that's fine since
 // they're all browser-specific. (This may change in the future.)
 void HtmlDialogWindowDelegateBridge::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
@@ skipping 107 matching lines @@
   // TODO(akalin): Figure out why implementing (void)cancel:(id)sender
   // to do the above doesn't work.
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   delegate_->WindowControllerClosed();
   [self autorelease];
 }
 
 @end