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

Unified Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.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/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
index d75ec52eb660b023247e0bb940397be77ed06ad8..042e2c774bf69793614bb7ba78954a9a0eaa26b0 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
@@ -9,7 +9,6 @@ import android.content.Intent;
import org.chromium.base.CommandLine;
import org.chromium.base.PathUtils;
import org.chromium.base.ResourceExtractor;
-import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromiumApplication;
import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
@@ -30,6 +29,7 @@ public class ChromeShellApplication extends ChromiumApplication {
private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromeshell";
private static final String[] CHROME_MANDATORY_PAKS = {
+ "en-US.pak",
"resources.pak",
"chrome_100_percent.pak",
};
@@ -62,7 +62,7 @@ public class ChromeShellApplication extends ChromiumApplication {
@Override
protected void initializeLibraryDependencies() {
- 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/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698