| OLD | NEW |
| 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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 } | 378 } |
| 379 } | 379 } |
| 380 } | 380 } |
| 381 | 381 |
| 382 // TODO: DIR_RESOURCE_PAKS_ANDROID needs to live somewhere sensible, | 382 // TODO: DIR_RESOURCE_PAKS_ANDROID needs to live somewhere sensible, |
| 383 // inlined here for simplicity setting up the HTMLViewer demo. Unfortunately | 383 // inlined here for simplicity setting up the HTMLViewer demo. Unfortunately |
| 384 // it can't go into base.PathService, as the native constant it refers to | 384 // it can't go into base.PathService, as the native constant it refers to |
| 385 // lives in the ui/ layer. See ui/base/ui_base_paths.h | 385 // lives in the ui/ layer. See ui/base/ui_base_paths.h |
| 386 private static final int DIR_RESOURCE_PAKS_ANDROID = 3003; | 386 private static final int DIR_RESOURCE_PAKS_ANDROID = 3003; |
| 387 | 387 |
| 388 private void startChromiumLocked() { | 388 protected void startChromiumLocked() { |
| 389 assert Thread.holdsLock(mLock) && ThreadUtils.runningOnUiThread(); | 389 assert Thread.holdsLock(mLock) && ThreadUtils.runningOnUiThread(); |
| 390 | 390 |
| 391 // The post-condition of this method is everything is ready, so notify n
ow to cover all | 391 // The post-condition of this method is everything is ready, so notify n
ow to cover all |
| 392 // return paths. (Other threads will not wake-up until we release |mLock
|, whatever). | 392 // return paths. (Other threads will not wake-up until we release |mLock
|, whatever). |
| 393 mLock.notifyAll(); | 393 mLock.notifyAll(); |
| 394 | 394 |
| 395 if (mStarted) { | 395 if (mStarted) { |
| 396 return; | 396 return; |
| 397 } | 397 } |
| 398 | 398 |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 688 WebViewDelegate getWebViewDelegate() { | 688 WebViewDelegate getWebViewDelegate() { |
| 689 return mWebViewDelegate; | 689 return mWebViewDelegate; |
| 690 } | 690 } |
| 691 | 691 |
| 692 // The method to support unreleased Android. | 692 // The method to support unreleased Android. |
| 693 WebViewContentsClientAdapter createWebViewContentsClientAdapter(WebView webV
iew, | 693 WebViewContentsClientAdapter createWebViewContentsClientAdapter(WebView webV
iew, |
| 694 Context context) { | 694 Context context) { |
| 695 return new WebViewContentsClientAdapter(webView, context, mWebViewDelega
te); | 695 return new WebViewContentsClientAdapter(webView, context, mWebViewDelega
te); |
| 696 } | 696 } |
| 697 } | 697 } |
| OLD | NEW |