trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc - Issue 21372006: Revert 212329 "Reland "Close web contents modal dialogs on conte..."

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: trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

Issue 21372006: Revert 212329 "Reland "Close web contents modal dialogs on conte..." (Closed) Base URL: svn://svn.chromium.org/chrome/

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

« no previous file with comments | « trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h ('k') | trunk/src/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc

===================================================================

--- trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc (revision 214772)

+++ trunk/src/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc (working copy)

@@ -70,7 +70,6 @@

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "grit/webkit_resources.h"

-#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

#include "net/cert/cert_status_flags.h"

#include "ui/base/base_window.h"

#include "ui/base/l10n/l10n_util.h"

@@ -2098,20 +2097,6 @@

}

////////////////////////////////////////////////////////////////////////////////

-// content::WebContentsObserver implementation.

-void AutofillDialogControllerImpl::DidNavigateMainFrame(

- const content::LoadCommittedDetails& details,

- const content::FrameNavigateParams& params) {

- // Close view if necessary.

- if (!net::registry_controlled_domains::SameDomainOrHost(

- details.previous_url, details.entry->GetURL(),

- net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES)) {

- Hide();

- }

-////////////////////////////////////////////////////////////////////////////////

// SuggestionsMenuModelDelegate implementation.

void AutofillDialogControllerImpl::SuggestionItemSelected(

@@ -2353,8 +2338,7 @@

const DialogType dialog_type,

const base::Callback<void(const FormStructure*,

const std::string&)>& callback)

- : WebContentsObserver(contents),

- profile_(Profile::FromBrowserContext(contents->GetBrowserContext())),

+ : profile_(Profile::FromBrowserContext(contents->GetBrowserContext())),

contents_(contents),

initial_user_state_(AutofillMetrics::DIALOG_USER_STATE_UNKNOWN),

dialog_type_(dialog_type),