| Index: blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
|
| diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
|
| index 6213cb63c12cdd1e441b803686705b73e7c9e173..4b8f09883a356df62eced428ddf886f74cdd4ef3 100644
|
| --- a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
|
| +++ b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
|
| @@ -175,6 +175,10 @@ public class BlimpRendererActivity extends Activity
|
| * @param url URL to load. If null, browser loads a default page.
|
| */
|
| private void handleUrl(String url) {
|
| + // TODO(shaktisahu): On a slow device, this might happen. Load the correct URL once the
|
| + // toolbar loading is complete (crbug/601226)
|
| + if (mToolbar == null) return;
|
| +
|
| if (url == null) {
|
| mToolbar.loadUrl("http://www.google.com/");
|
| } else {
|
|
|