Add a blocking version of the sync promo dialog

chrome/browser/ui/gtk/html_dialog_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/html_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/property_bag.h"
 #include "base/utf_string_conversions.h"
@@ skipping 20 matching lines @@
                                  HtmlDialogUIDelegate* delegate,
                                  DialogStyle style) {
   // Ignore style for now. The style parameter only used in the implementation
   // in html_dialog_view.cc file.
   // TODO (bshe): Add style parameter to HtmlDialogGtk.
   HtmlDialogGtk* html_dialog =
       new HtmlDialogGtk(profile, browser, delegate, parent);
   return html_dialog->InitDialog();
 }
 
+void CloseHtmlDialog(gfx::NativeWindow window) {
+  gtk_widget_destroy(GTK_WIDGET(window));
+}
+
 } // namespace browser
 
 namespace {
 
 void SetDialogStyle() {
   static bool style_was_set = false;
 
   if (style_was_set)
     return;
   style_was_set = true;
@@ skipping 93 matching lines @@
 
 void HtmlDialogGtk::CloseContents(WebContents* source) {
   DCHECK(dialog_);
 
   bool close_dialog = false;
   OnCloseContents(source, &close_dialog);
   if (close_dialog)
     OnDialogClosed(std::string());
 }
 
+content::WebContents* HtmlDialogGtk::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 HtmlDialogGtk::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]

same here

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

Done.

+    return;
+  }
+  HtmlDialogTabContentsDelegate::AddNewContents(
+      source, new_contents, disposition, initial_pos, user_gesture);
+}
+
 bool HtmlDialogGtk::ShouldShowDialogTitle() const {
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // content::WebContentsDelegate implementation:
 
 // A simplified version of BrowserWindowGtk::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.)
@@ skipping 54 matching lines @@
                               dialog_size.height());
 
   gtk_widget_show_all(dialog_);
 
   return GTK_WINDOW(dialog_);
 }
 
 void HtmlDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
   OnDialogClosed(std::string());
 }