| 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.annotation.SuppressLint; | 7 import android.annotation.SuppressLint; |
| 8 import android.annotation.TargetApi; | 8 import android.annotation.TargetApi; |
| 9 import android.content.Context; | 9 import android.content.Context; |
| 10 import android.graphics.Bitmap; | 10 import android.graphics.Bitmap; |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 | 165 |
| 166 void setWebViewClient(WebViewClient client) { | 166 void setWebViewClient(WebViewClient client) { |
| 167 if (client != null) { | 167 if (client != null) { |
| 168 mWebViewClient = client; | 168 mWebViewClient = client; |
| 169 } else { | 169 } else { |
| 170 mWebViewClient = sNullWebViewClient; | 170 mWebViewClient = sNullWebViewClient; |
| 171 } | 171 } |
| 172 } | 172 } |
| 173 | 173 |
| 174 WebViewClient getWebViewClient() { | 174 WebViewClient getWebViewClient() { |
| 175 // If this hasn't been set yet, return null instead of exposing sNullWeb
ViewClient | 175 return mWebViewClient; |
| 176 return mWebViewClient == sNullWebViewClient ? null : mWebViewClient; | |
| 177 } | 176 } |
| 178 | 177 |
| 179 void setWebChromeClient(WebChromeClient client) { | 178 void setWebChromeClient(WebChromeClient client) { |
| 180 mWebChromeClient = client; | 179 mWebChromeClient = client; |
| 181 } | 180 } |
| 182 | 181 |
| 183 WebChromeClient getWebChromeClient() { | 182 WebChromeClient getWebChromeClient() { |
| 184 return mWebChromeClient; | 183 return mWebChromeClient; |
| 185 } | 184 } |
| 186 | 185 |
| (...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1305 mAwPermissionRequest.deny(); | 1304 mAwPermissionRequest.deny(); |
| 1306 } | 1305 } |
| 1307 } | 1306 } |
| 1308 | 1307 |
| 1309 @Override | 1308 @Override |
| 1310 public void deny() { | 1309 public void deny() { |
| 1311 mAwPermissionRequest.deny(); | 1310 mAwPermissionRequest.deny(); |
| 1312 } | 1311 } |
| 1313 } | 1312 } |
| 1314 } | 1313 } |
| OLD | NEW |