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

Side by Side Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

Issue 2369683002: Revert of Move language pak files to assets. (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 unified diff | Download patch
« no previous file with comments | « android_webview/glue/BUILD.gn ('k') | android_webview/system_webview_apk_tmpl.gni » ('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 com.android.webview.chromium; 5 package com.android.webview.chromium;
6 6
7 import android.Manifest; 7 import android.Manifest;
8 import android.app.ActivityManager; 8 import android.app.ActivityManager;
9 import android.content.ComponentCallbacks2; 9 import android.content.ComponentCallbacks2;
10 import android.content.Context; 10 import android.content.Context;
(...skipping 29 matching lines...) Expand all
40 import org.chromium.android_webview.AwContentsStatics; 40 import org.chromium.android_webview.AwContentsStatics;
41 import org.chromium.android_webview.AwCookieManager; 41 import org.chromium.android_webview.AwCookieManager;
42 import org.chromium.android_webview.AwDevToolsServer; 42 import org.chromium.android_webview.AwDevToolsServer;
43 import org.chromium.android_webview.AwGeolocationPermissions; 43 import org.chromium.android_webview.AwGeolocationPermissions;
44 import org.chromium.android_webview.AwNetworkChangeNotifierRegistrationPolicy; 44 import org.chromium.android_webview.AwNetworkChangeNotifierRegistrationPolicy;
45 import org.chromium.android_webview.AwQuotaManagerBridge; 45 import org.chromium.android_webview.AwQuotaManagerBridge;
46 import org.chromium.android_webview.AwResource; 46 import org.chromium.android_webview.AwResource;
47 import org.chromium.android_webview.AwServiceWorkerController; 47 import org.chromium.android_webview.AwServiceWorkerController;
48 import org.chromium.android_webview.AwSettings; 48 import org.chromium.android_webview.AwSettings;
49 import org.chromium.android_webview.HttpAuthDatabase; 49 import org.chromium.android_webview.HttpAuthDatabase;
50 import org.chromium.android_webview.R;
50 import org.chromium.android_webview.ResourcesContextWrapperFactory; 51 import org.chromium.android_webview.ResourcesContextWrapperFactory;
51 import org.chromium.base.BuildConfig; 52 import org.chromium.base.BuildConfig;
52 import org.chromium.base.CommandLine; 53 import org.chromium.base.CommandLine;
53 import org.chromium.base.ContextUtils; 54 import org.chromium.base.ContextUtils;
54 import org.chromium.base.MemoryPressureListener; 55 import org.chromium.base.MemoryPressureListener;
55 import org.chromium.base.PathService; 56 import org.chromium.base.PathService;
56 import org.chromium.base.PathUtils; 57 import org.chromium.base.PathUtils;
57 import org.chromium.base.ThreadUtils; 58 import org.chromium.base.ThreadUtils;
58 import org.chromium.base.TraceEvent; 59 import org.chromium.base.TraceEvent;
59 import org.chromium.base.annotations.SuppressFBWarnings; 60 import org.chromium.base.annotations.SuppressFBWarnings;
60 import org.chromium.base.library_loader.LibraryLoader; 61 import org.chromium.base.library_loader.LibraryLoader;
61 import org.chromium.base.library_loader.LibraryProcessType; 62 import org.chromium.base.library_loader.LibraryProcessType;
62 import org.chromium.base.library_loader.ProcessInitException; 63 import org.chromium.base.library_loader.ProcessInitException;
63 import org.chromium.content.browser.ContentViewStatics; 64 import org.chromium.content.browser.ContentViewStatics;
64 import org.chromium.net.NetworkChangeNotifier; 65 import org.chromium.net.NetworkChangeNotifier;
65 import org.chromium.ui.LocalePakFiles;
66 import org.chromium.ui.base.ResourceBundle; 66 import org.chromium.ui.base.ResourceBundle;
67 67
68 import java.io.File; 68 import java.io.File;
69 import java.util.Queue; 69 import java.util.Queue;
70 import java.util.concurrent.Callable; 70 import java.util.concurrent.Callable;
71 import java.util.concurrent.ConcurrentLinkedQueue; 71 import java.util.concurrent.ConcurrentLinkedQueue;
72 import java.util.concurrent.FutureTask; 72 import java.util.concurrent.FutureTask;
73 import java.util.concurrent.TimeUnit; 73 import java.util.concurrent.TimeUnit;
74 74
75 /** 75 /**
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 } catch (ProcessInitException e) { 378 } catch (ProcessInitException e) {
379 throw new RuntimeException("Error initializing WebView library", e); 379 throw new RuntimeException("Error initializing WebView library", e);
380 } 380 }
381 381
382 PathService.override(PathService.DIR_MODULE, "/system/lib/"); 382 PathService.override(PathService.DIR_MODULE, "/system/lib/");
383 PathService.override(DIR_RESOURCE_PAKS_ANDROID, "/system/framework/webvi ew/paks"); 383 PathService.override(DIR_RESOURCE_PAKS_ANDROID, "/system/framework/webvi ew/paks");
384 384
385 // Make sure that ResourceProvider is initialized before starting the br owser process. 385 // Make sure that ResourceProvider is initialized before starting the br owser process.
386 final String webViewPackageName = WebViewFactory.getLoadedPackageInfo(). packageName; 386 final String webViewPackageName = WebViewFactory.getLoadedPackageInfo(). packageName;
387 setUpResources(webViewPackageName, context); 387 setUpResources(webViewPackageName, context);
388 ResourceBundle.initializeLocalePaks(LocalePakFiles.getFiles()); 388 ResourceBundle.initializeLocalePaks(context, R.array.locale_paks);
389 initPlatSupportLibrary(); 389 initPlatSupportLibrary();
390 initNetworkChangeNotifier(context); 390 initNetworkChangeNotifier(context);
391 final int extraBindFlags = Context.BIND_EXTERNAL_SERVICE; 391 final int extraBindFlags = Context.BIND_EXTERNAL_SERVICE;
392 AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, extra BindFlags); 392 AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, extra BindFlags);
393 AwBrowserProcess.start(); 393 AwBrowserProcess.start();
394 394
395 if (isBuildDebuggable()) { 395 if (isBuildDebuggable()) {
396 setWebContentsDebuggingEnabled(true); 396 setWebContentsDebuggingEnabled(true);
397 } 397 }
398 398
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 mWebViewDatabase = new WebViewDatabaseAdapter(this, awDatabase); 646 mWebViewDatabase = new WebViewDatabaseAdapter(this, awDatabase);
647 } 647 }
648 } 648 }
649 return mWebViewDatabase; 649 return mWebViewDatabase;
650 } 650 }
651 651
652 WebViewDelegate getWebViewDelegate() { 652 WebViewDelegate getWebViewDelegate() {
653 return mWebViewDelegate; 653 return mWebViewDelegate;
654 } 654 }
655 } 655 }
OLDNEW
« no previous file with comments | « android_webview/glue/BUILD.gn ('k') | android_webview/system_webview_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698