base/android/java/src/org/chromium/base/LocaleUtils.java - Issue 754433003: Update from https://crrev.com/305340

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: base/android/java/src/org/chromium/base/LocaleUtils.java

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master

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

Index: base/android/java/src/org/chromium/base/LocaleUtils.java

diff --git a/base/android/java/src/org/chromium/base/LocaleUtils.java b/base/android/java/src/org/chromium/base/LocaleUtils.java

index 4f97d3a25c74e8a9bb4c29b936ee9abcf942639c..82b2c8fc6667cd7ccc7cd96c58bfaef8d76ab595 100644

--- a/base/android/java/src/org/chromium/base/LocaleUtils.java

+++ b/base/android/java/src/org/chromium/base/LocaleUtils.java

@@ -47,9 +47,9 @@ public class LocaleUtils {

@CalledByNative

private static String getDefaultCountryCode() {

CommandLine commandLine = CommandLine.getInstance();

- return commandLine.hasSwitch(BaseSwitches.DEFAULT_COUNTRY_CODE_AT_INSTALL) ?

- commandLine.getSwitchValue(BaseSwitches.DEFAULT_COUNTRY_CODE_AT_INSTALL) :

- Locale.getDefault().getCountry();

+ return commandLine.hasSwitch(BaseSwitches.DEFAULT_COUNTRY_CODE_AT_INSTALL)

+ ? commandLine.getSwitchValue(BaseSwitches.DEFAULT_COUNTRY_CODE_AT_INSTALL)

+ : Locale.getDefault().getCountry();

}