chrome/android/java/src/org/chromium/chrome/browser/locale/SearchEnginePromoDialog.java - Issue 2398533002: Implement search engine auto switch when entering or leaving some locale

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/android/java/src/org/chromium/chrome/browser/locale/SearchEnginePromoDialog.java

Issue 2398533002: Implement search engine auto switch when entering or leaving some locale (Closed)

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

« chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/locale/SpecialLocaleHandler.java » ('j') | tools/metrics/histograms/histograms.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/locale/SearchEnginePromoDialog.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/locale/SearchEnginePromoDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/locale/SearchEnginePromoDialog.java

index 770a9e426215f97f41749de67fd7be728ddcee99..ab1bff228f89de777bab37eecdce0f2175839ecc 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/locale/SearchEnginePromoDialog.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/locale/SearchEnginePromoDialog.java

@@ -77,11 +77,12 @@ public class SearchEnginePromoDialog extends Dialog implements View.OnClickListe

}

private void keepGoogle() {

+ mLocaleManager.setSearchEngineAutoSwitch(false);

mLocaleManager.addSpecialSearchEngines();

- // TODO(ianwen): Disable search engine auto switching here.

}

private void useSogou() {

+ mLocaleManager.setSearchEngineAutoSwitch(true);

mLocaleManager.addSpecialSearchEngines();

mLocaleManager.overrideDefaultSearchEngine();

}