Chromium Code Reviews| 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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 532 } | 532 } |
| 533 return mWebStorage; | 533 return mWebStorage; |
| 534 } | 534 } |
| 535 | 535 |
| 536 @Override | 536 @Override |
| 537 public WebViewDatabase getWebViewDatabase(final Context context) { | 537 public WebViewDatabase getWebViewDatabase(final Context context) { |
| 538 synchronized (mLock) { | 538 synchronized (mLock) { |
| 539 if (mWebViewDatabase == null) { | 539 if (mWebViewDatabase == null) { |
| 540 ensureChromiumStartedLocked(true); | 540 ensureChromiumStartedLocked(true); |
| 541 mWebViewDatabase = new WebViewDatabaseAdapter( | 541 mWebViewDatabase = new WebViewDatabaseAdapter( |
| 542 runOnUiThreadBlocking(new Callable<HttpAuthDatabase>() { | 542 this, runOnUiThreadBlocking(new Callable<HttpAuthDatabas e>() { |
|
Torne
2016/07/29 11:26:51
Isn't this going to have the same problem as the o
boliu
2016/07/29 13:25:05
Yeah this will have to be rebased onto part 2 agai
| |
| 543 @Override | 543 @Override |
| 544 public HttpAuthDatabase call() { | 544 public HttpAuthDatabase call() { |
| 545 return getBrowserContextOnUiThread().getHttpAuth Database(context); | 545 return getBrowserContextOnUiThread().getHttpAuth Database(context); |
| 546 } | 546 } |
| 547 })); | 547 })); |
| 548 } | 548 } |
| 549 } | 549 } |
| 550 return mWebViewDatabase; | 550 return mWebViewDatabase; |
| 551 } | 551 } |
| 552 | 552 |
| 553 WebViewDelegate getWebViewDelegate() { | 553 WebViewDelegate getWebViewDelegate() { |
| 554 return mWebViewDelegate; | 554 return mWebViewDelegate; |
| 555 } | 555 } |
| 556 } | 556 } |
| OLD | NEW |