diff options
| author | Benoit Lize <lizeb@chromium.org> | 2015-08-26 19:12:32 +0200 |
|---|---|---|
| committer | Benoit Lize <lizeb@chromium.org> | 2015-08-26 17:13:40 +0000 |
| commit | 5e8a551089e0e3d63ed85b9f0f472b42701444a4 (patch) | |
| tree | d1b88c5e6a997c2d699cd3c04e8a3079eb7f2af8 | |
| parent | afcfe0ed23d1b125013092f191d2c88c268da093 (diff) | |
| download | chromium_src-5e8a551089e0e3d63ed85b9f0f472b42701444a4.zip chromium_src-5e8a551089e0e3d63ed85b9f0f472b42701444a4.tar.gz chromium_src-5e8a551089e0e3d63ed85b9f0f472b42701444a4.tar.bz2 | |
customtabs: Make sure that the browser process is initialized in mayLaunchUrl().
Since the documentation doesn't force clients to call warmup() before
mayLaunchUrl(), call warmup() for them inside mayLaunchUrl() if
necessary.
BUG=525002
Review URL: https://codereview.chromium.org/1311423003
Cr-Commit-Position: refs/heads/master@{#345590}
(cherry picked from commit d9879f1dc467a031829d5a769f572b99b5c37463)
TBR=yusufo@chromium.org
NOTRY=true
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1316973004 .
Cr-Commit-Position: refs/branch-heads/2454@{#430}
Cr-Branched-From: 12bfc3360892ec53cd00fc239a47e5298beb063b-refs/heads/master@{#338390}
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java index db4757f..ba7f8a7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java @@ -230,6 +230,9 @@ class CustomTabsConnection extends ICustomTabsService.Stub { if (scheme != null && !scheme.equals("http") && !scheme.equals("https")) return false; if (!isCallerForegroundOrSelf()) return false; + // Things below need the browser process to be initialized. + if (!warmup(0)) return false; + final IBinder session = callback.asBinder(); final String urlString = url.toString(); int uid = Binder.getCallingUid(); |