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

Side by Side Diff: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_android_paks.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.shell; 5 package org.chromium.chrome.shell;
6 6
7 import android.content.Intent; 7 import android.content.Intent;
8 8
9 import org.chromium.base.CommandLine; 9 import org.chromium.base.CommandLine;
10 import org.chromium.base.PathUtils; 10 import org.chromium.base.PathUtils;
11 import org.chromium.chrome.browser.ChromiumApplication; 11 import org.chromium.chrome.browser.ChromiumApplication;
12 import org.chromium.chrome.browser.PKCS11AuthenticationManager; 12 import org.chromium.chrome.browser.PKCS11AuthenticationManager;
13 import org.chromium.chrome.browser.UmaUtils; 13 import org.chromium.chrome.browser.UmaUtils;
14 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGe nerator; 14 import org.chromium.chrome.browser.invalidation.UniqueIdInvalidationClientNameGe nerator;
15 import org.chromium.content.browser.ResourceExtractor; 15 import org.chromium.content.browser.ResourceExtractor;
16 16
17 import java.util.ArrayList; 17 import java.util.ArrayList;
18 18
19 /** 19 /**
20 * A basic test shell {@link android.app.Application}. Handles setting up the n ative library and 20 * A basic test shell {@link android.app.Application}. Handles setting up the n ative library and
21 * loading the right resources. 21 * loading the right resources.
22 */ 22 */
23 public class ChromeShellApplication extends ChromiumApplication { 23 public class ChromeShellApplication extends ChromiumApplication {
24 private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshe ll"; 24 private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "chromiumtestshe ll";
25 /**
26 * icudtl.dat provides ICU (i18n library) with all the necessary data
27 * for its operation. We used to link the data statically to our binary,
28 * but don't do that any more and need to install along with pak files.
29 * See src/third_party/icu/README.chromium.
30 */
25 private static final String[] CHROME_MANDATORY_PAKS = { 31 private static final String[] CHROME_MANDATORY_PAKS = {
26 "en-US.pak", 32 "en-US.pak",
27 "resources.pak", 33 "resources.pak",
28 "chrome_100_percent.pak", 34 "chrome_100_percent.pak",
35 "icudtl.dat",
29 }; 36 };
30 private static final String COMMAND_LINE_FILE = 37 private static final String COMMAND_LINE_FILE =
31 "/data/local/tmp/chromium-testshell-command-line"; 38 "/data/local/tmp/chromium-testshell-command-line";
32 39
33 ArrayList<ChromeShellApplicationObserver> mObservers; 40 ArrayList<ChromeShellApplicationObserver> mObservers;
34 41
35 @Override 42 @Override
36 public void onCreate() { 43 public void onCreate() {
37 // We want to do this at the earliest possible point in startup. 44 // We want to do this at the earliest possible point in startup.
38 UmaUtils.recordMainEntryPointTime(); 45 UmaUtils.recordMainEntryPointTime();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 @Override 94 @Override
88 protected boolean areParentalControlsEnabled() { 95 protected boolean areParentalControlsEnabled() {
89 return false; 96 return false;
90 } 97 }
91 98
92 @Override 99 @Override
93 protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() { 100 protected PKCS11AuthenticationManager getPKCS11AuthenticationManager() {
94 return new TestShellPKCS11AuthenticationManager(); 101 return new TestShellPKCS11AuthenticationManager();
95 } 102 }
96 } 103 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_android_paks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698