chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc - Issue 74563003: Removed some GetActiveEntry references in autofill

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/android/autofill/autofill_dialog_controller_android.cc

Issue 74563003: Removed some GetActiveEntry references in autofill (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed merge conflict Created 7 years, 1 month 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 | « no previous file | chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc » ('j') | chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc

diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc

index 09b4d9e476cc083f0ccb8ae486ab9be7557ecf5f..38db11d572000db55e48b5486a696aca383443e8 100644

--- a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc

+++ b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc

@@ -192,9 +192,9 @@ void AutofillDialogControllerAndroid::Show() {

JNIEnv* env = base::android::AttachCurrentThread();

dialog_shown_timestamp_ = base::Time::Now();

- content::NavigationEntry* entry = contents_->GetController().GetActiveEntry();

- const GURL& active_url = entry ? entry->GetURL() : contents_->GetURL();

- invoked_from_same_origin_ = active_url.GetOrigin() == source_url_.GetOrigin();

+ const GURL& current_url = contents_->GetLastCommittedURL();

+ invoked_from_same_origin_ =

+ current_url.GetContent() == source_url_.GetOrigin();

Charlie Reis 2013/11/19 21:49:15 Why is this GetContent()? It should be GetOrigin(

jww 2013/11/19 22:00:00 Done.

// Determine what field types should be included in the dialog.

bool has_types = false;