chrome/browser/ui/extensions/shell_window.cc - Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/extensions/shell_window.cc

Issue 11647017: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years 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

« no previous file with comments | « chrome/browser/ui/constrained_window_tab_helper_unittest.cc ('k') | chrome/browser/ui/gtk/collected_cookies_gtk.h » ('j') | chrome/browser/ui/web_contents_modal_dialog.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/shell_window.cc

diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc

index c01b5d58f62c7f9a738c0d783951d1001b5c8d05..550a22edd45af60cb3f422cf7998fa7939261f79 100644

--- a/chrome/browser/ui/extensions/shell_window.cc

+++ b/chrome/browser/ui/extensions/shell_window.cc

@@ -23,9 +23,9 @@

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.h"

-#include "chrome/browser/ui/constrained_window_tab_helper.h"

#include "chrome/browser/ui/extensions/native_app_window.h"

#include "chrome/browser/ui/intents/web_intent_picker_controller.h"

+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"

#include "chrome/browser/view_type_utils.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/extensions/api/app_window.h"

@@ -124,7 +124,7 @@ void ShellWindow::Init(const GURL& url,

web_contents_.reset(WebContents::Create(WebContents::CreateParams(

profile(), SiteInstance::CreateForURL(profile(), url))));

- ConstrainedWindowTabHelper::CreateForWebContents(web_contents_.get());

+ WebContentsModalDialogManager::CreateForWebContents(web_contents_.get());

FaviconTabHelper::CreateForWebContents(web_contents_.get());

WebIntentPickerController::CreateForWebContents(web_contents_.get());