Add a blocking version of the sync promo dialog

chrome/browser/ui/views/html_dialog_view.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/views/html_dialog_view.h"
 
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 32 matching lines @@
                                  Browser* browser,
                                  HtmlDialogUIDelegate* delegate,
                                  DialogStyle style) {
   HtmlDialogView* html_view = new HtmlDialogView(profile, browser, delegate);
   browser::CreateViewsWindow(parent, html_view, style);
   html_view->InitDialog();
   html_view->GetWidget()->Show();
   return html_view->GetWidget()->GetNativeWindow();
 }
 
+void CloseHtmlDialog(gfx::NativeWindow window) {
+  views::Widget::GetWidgetForNativeWindow(window)->Close();
+}
+
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView, public:
 
 HtmlDialogView::HtmlDialogView(Profile* profile,
                                Browser* browser,
                                HtmlDialogUIDelegate* delegate)
     : DOMView(),
       HtmlDialogTabContentsDelegate(profile),
@@ skipping 182 matching lines @@
 #endif
 }
 
 void HtmlDialogView::CloseContents(WebContents* source) {
   bool close_dialog = false;
   OnCloseContents(source, &close_dialog);
   if (close_dialog)
     OnDialogClosed(std::string());
 }
 
+content::WebContents* HtmlDialogView::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 HtmlDialogView::AddNewContents(content::WebContents* source,
+                                    content::WebContents* new_contents,
+                                    WindowOpenDisposition disposition,
+                                    const gfx::Rect& initial_pos,
+                                    bool user_gesture) {
+  if (delegate_ && delegate_->HandlerAddNewContents(

[sky, 2012/01/30 15:27:47]

HandlerAddNewContents->HandleAddNewContents.

[sail, 2012/01/30 17:13:03]

Done.

+      source, new_contents, disposition, initial_pos, user_gesture)) {
+    return;
+  }
+  HtmlDialogTabContentsDelegate::AddNewContents(
+      source, new_contents, disposition, initial_pos, user_gesture);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogView:
 
 void HtmlDialogView::InitDialog() {
   // Now Init the DOMView. This view runs in its own process to render the html.
   DOMView::Init(profile(), NULL);
 
   WebContents* web_contents = dom_contents_->web_contents();
   web_contents->SetDelegate(this);
 
@@ skipping 18 matching lines @@
 }
 
 void HtmlDialogView::OnTabMainFrameFirstRender() {
 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
   if (initialized_) {
     views::NativeWidgetGtk::UpdateFreezeUpdatesProperty(
         GTK_WINDOW(GetWidget()->GetNativeView()), false);
   }
 #endif
 }