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

Unified Diff: chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.cc

Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 8 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/webui/chrome_web_dialog_web_contents_delegate.cc
===================================================================
--- chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.cc (revision 0)
+++ chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.cc (revision 0)
@@ -0,0 +1,111 @@
+// 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/webui/chrome_web_dialog_web_contents_delegate.h"
+
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "content/public/browser/web_contents.h"
+
+using content::OpenURLParams;
+using content::WebContents;
+
+// Incognito profiles are not long-lived, so we always want to store a
+// non-incognito profile.
+//
+// TODO(akalin): Should we make it so that we have a default incognito
+// profile that's long-lived? Of course, we'd still have to clear it out
+// when all incognito browsers close.
+ChromeWebDialogWebContentsDelegate::ChromeWebDialogWebContentsDelegate(
+ Profile* profile)
+ : web_dialogs::WebDialogWebContentsDelegate(profile),
+ profile_(profile) {
+}
+
+ChromeWebDialogWebContentsDelegate::~ChromeWebDialogWebContentsDelegate() {
+}
+
+Profile* ChromeWebDialogWebContentsDelegate::profile() const {
+ return profile_;
+}
+
+void ChromeWebDialogWebContentsDelegate::Detach() {
+ web_dialogs::WebDialogWebContentsDelegate::Detach();
+ profile_ = NULL;
+}
+
+WebContents* ChromeWebDialogWebContentsDelegate::OpenURLFromTab(
+ WebContents* source, const OpenURLParams& params) {
+ WebContents* new_contents = NULL;
+ StaticOpenURLFromTab(profile_, source, params, &new_contents);
+ return new_contents;
+}
+
+// static
+Browser* ChromeWebDialogWebContentsDelegate::StaticOpenURLFromTab(
+ Profile* profile, WebContents* source, const OpenURLParams& params,
+ WebContents** out_new_contents) {
+ if (!profile)
+ return NULL;
+
+ // Specify a NULL browser for navigation. This will cause Navigate()
+ // to find a browser matching params.profile or create a new one.
+ Browser* browser = NULL;
+ browser::NavigateParams nav_params(browser, params.url, params.transition);
+ nav_params.profile = profile;
+ nav_params.referrer = params.referrer;
+ if (source && source->IsCrashed() &&
+ params.disposition == CURRENT_TAB &&
+ params.transition == content::PAGE_TRANSITION_LINK) {
+ nav_params.disposition = NEW_FOREGROUND_TAB;
+ } else {
+ nav_params.disposition = params.disposition;
+ }
+ nav_params.window_action = browser::NavigateParams::SHOW_WINDOW;
+ nav_params.user_gesture = true;
+ browser::Navigate(&nav_params);
+ *out_new_contents = nav_params.target_contents ?
+ nav_params.target_contents->web_contents() : NULL;
+ return nav_params.browser;
+}
+
+void ChromeWebDialogWebContentsDelegate::AddNewContents(
+ WebContents* source, WebContents* new_contents,
+ WindowOpenDisposition disposition, const gfx::Rect& initial_pos,
+ bool user_gesture) {
+ StaticAddNewContents(profile_, source, new_contents, disposition,
+ initial_pos, user_gesture);
+}
+
+// static
+Browser* ChromeWebDialogWebContentsDelegate::StaticAddNewContents(
+ Profile* profile,
+ WebContents* source,
+ WebContents* new_contents,
+ WindowOpenDisposition disposition,
+ const gfx::Rect& initial_pos,
+ bool user_gesture) {
+ if (!profile)
+ return NULL;
+
+ // Specify a NULL browser for navigation. This will cause Navigate()
+ // to find a browser matching params.profile or create a new one.
+ Browser* browser = NULL;
+
+ TabContentsWrapper* wrapper = new TabContentsWrapper(new_contents);
+ browser::NavigateParams params(browser, wrapper);
+ params.profile = profile;
+ // TODO(pinkerton): no way to get a wrapper for this.
+ // params.source_contents = source;
+ params.disposition = disposition;
+ params.window_bounds = initial_pos;
+ params.window_action = browser::NavigateParams::SHOW_WINDOW;
+ params.user_gesture = true;
+ browser::Navigate(&params);
+
+ return params.browser;
+}

Powered by Google App Engine
This is Rietveld 408576698