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

Unified Diff: chrome/browser/ui/views/html_dialog_view.cc

Issue 9225053: Add a blocking version of the sync promo dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 months 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/views/html_dialog_view.cc
diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc
index 0b8f93759bfd2c502586eedea76b5de86dfed606..e4130247c2c63b950a10eabe2602ac72c82c4642 100644
--- a/chrome/browser/ui/views/html_dialog_view.cc
+++ b/chrome/browser/ui/views/html_dialog_view.cc
@@ -50,6 +50,10 @@ gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent,
return html_view->GetWidget()->GetNativeWindow();
}
+void CloseHtmlDialog(gfx::NativeWindow window) {
+ views::Widget::GetWidgetForNativeWindow(window)->Close();
+}
+
} // namespace browser
////////////////////////////////////////////////////////////////////////////////
@@ -252,6 +256,30 @@ void HtmlDialogView::CloseContents(WebContents* source) {
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:

Powered by Google App Engine
This is Rietveld 408576698