chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc - Issue 1391893003: NOT FOR REVIEW: Aura on Android

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

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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 | « chrome/browser/ui/autofill/credit_card_scanner_view.cc ('k') | chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc » ('j') | content/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc

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

index 935a33875e6729157c7f7504552b7650da961b45..da7dc0eb7b315fc1a89f2394130bb54da29f6bdc 100644

--- a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc

+++ b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc

@@ -34,7 +34,7 @@

#include "ui/gfx/geometry/rect_conversions.h"

#include "ui/gfx/text_utils.h"

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && !defined(USE_AURA)

#include "chrome/browser/android/chrome_application.h"

#endif

@@ -232,7 +232,7 @@ void PasswordGenerationPopupControllerImpl::ViewDestroyed() {

}

void PasswordGenerationPopupControllerImpl::OnSavedPasswordsLinkClicked() {

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && !defined(USE_AURA)

chrome::android::ChromeApplication::ShowPasswordSettings();

#else

chrome::ShowSettingsSubPage(