Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3581)

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java

Issue 1200583002: Revert "Android: Store language .pak files in res/raw rather than assets" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
Index: chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java
index 1ac9afbfcba1c4825824c23f6a147c0eaa05aab0..35b14467f942b8e95f328eeb5766eb78c6ab9e6d 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java
@@ -24,7 +24,6 @@ import org.chromium.base.ResourceExtractor;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.chrome.R;
import org.chromium.chrome.browser.accessibility.FontSizePrefs;
import org.chromium.chrome.browser.banners.AppBannerManager;
import org.chromium.chrome.browser.banners.AppDetailsDelegate;
@@ -128,8 +127,7 @@ public class ChromeMobileApplication extends ChromiumApplication {
}
private static final String[] CHROME_MANDATORY_PAKS = {
- "resources.pak",
- "chrome_100_percent.pak",
+ "en-US.pak", "resources.pak", "chrome_100_percent.pak",
};
private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chrome";
private static final String DEV_TOOLS_SERVER_SOCKET_PREFIX = "chrome";
@@ -198,7 +196,7 @@ public class ChromeMobileApplication extends ChromiumApplication {
protected void initializeLibraryDependencies() {
// The ResourceExtractor is only needed by the browser process, but this will have no
// impact on the renderer process construction.
- ResourceExtractor.setMandatoryPaksToExtract(R.array.locale_paks, CHROME_MANDATORY_PAKS);
+ ResourceExtractor.setMandatoryPaksToExtract(CHROME_MANDATORY_PAKS);
PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);
}
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698