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

Side by Side Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.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 unified diff | Download patch
« no previous file with comments | « no previous file | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java » ('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.app.ActivityManager; 7 import android.app.ActivityManager;
8 import android.content.ComponentCallbacks2; 8 import android.content.ComponentCallbacks2;
9 import android.content.Context; 9 import android.content.Context;
10 import android.content.Intent; 10 import android.content.Intent;
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // The post-condition of this method is everything is ready, so notify n ow to cover all 225 // The post-condition of this method is everything is ready, so notify n ow to cover all
226 // return paths. (Other threads will not wake-up until we release |mLock |, whatever). 226 // return paths. (Other threads will not wake-up until we release |mLock |, whatever).
227 mLock.notifyAll(); 227 mLock.notifyAll();
228 228
229 if (mStarted) { 229 if (mStarted) {
230 return; 230 return;
231 } 231 }
232 232
233 // We don't need to extract any paks because for WebView, they are 233 // We don't need to extract any paks because for WebView, they are
234 // in the system image. 234 // in the system image.
235 ResourceExtractor.setMandatoryPaksToExtract(0); 235 ResourceExtractor.setMandatoryPaksToExtract("");
236 236
237 try { 237 try {
238 LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitiali zed(); 238 LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitiali zed();
239 } catch (ProcessInitException e) { 239 } catch (ProcessInitException e) {
240 throw new RuntimeException("Error initializing WebView library", e); 240 throw new RuntimeException("Error initializing WebView library", e);
241 } 241 }
242 242
243 PathService.override(PathService.DIR_MODULE, "/system/lib/"); 243 PathService.override(PathService.DIR_MODULE, "/system/lib/");
244 PathService.override(DIR_RESOURCE_PAKS_ANDROID, "/system/framework/webvi ew/paks"); 244 PathService.override(DIR_RESOURCE_PAKS_ANDROID, "/system/framework/webvi ew/paks");
245 245
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 browserContext.getHttpAuthDatabase(context)); 463 browserContext.getHttpAuthDatabase(context));
464 } 464 }
465 } 465 }
466 return mWebViewDatabase; 466 return mWebViewDatabase;
467 } 467 }
468 468
469 WebViewDelegate getWebViewDelegate() { 469 WebViewDelegate getWebViewDelegate() {
470 return mWebViewDelegate; 470 return mWebViewDelegate;
471 } 471 }
472 } 472 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698