commit c70ae6384e8a98afb98b937b490d0e1c9a88a35f
author Vivek Sekhar <vsekhar@codeaurora.org> Wed Apr 08 17:54:05 2015 -0700
committer WebTech Code Review <code-review@localhost> Tue Apr 21 13:55:03 2015 -0700
tree 75912f23865ef312dc5a139e93375084d88abedc
parent 4f5137dd251c0ed9fde8bcd0dca46d04c662b4bd

Cleanup tab crash view from browser

Change-Id: Ic382071ef6cfdac1a45e187d331493fe15b0f1b3

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 07f2d12..1138700 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -403,7 +403,6 @@
                 && BrowserActivity.ACTION_SHOW_BOOKMARKS.equals(intent.getAction())) {
             bookmarksOrHistoryPicker(ComboViews.Bookmarks);
         }
-
         mLowPowerReceiver = new PowerConnectionReceiver();
         mPowerChangeReceiver = new PowerConnectionReceiver();
 
@@ -415,7 +414,6 @@
         }
         filter.addAction(Intent.ACTION_BATTERY_OKAY);
         mActivity.registerReceiver(mPowerChangeReceiver, filter);
-
     }
 
     private static class PruneThumbnails implements Runnable {
@@ -457,10 +455,7 @@
 
     @Override
     public void onSetWebView(Tab tab, WebView view) {
-        if (tab.hasCrashed)
-            tab.showCrashView();
-        else
-            mUi.onSetWebView(tab, view);
+        mUi.onSetWebView(tab, view);
     }
 
     @Override
@@ -766,7 +761,6 @@
 
         WebView.disablePlatformNotifications();
         NfcHandler.unregister(mActivity);
-
         mActivity.unregisterReceiver(mLowPowerReceiver);
     }
 
@@ -814,10 +808,8 @@
             mUi.onVoiceResult(mVoiceResult);
             mVoiceResult = null;
         }
-        if (current != null && current.hasCrashed) {
-            current.replaceCrashView(current.getWebView(), current.getViewContainer());
-        }
-
+        if (current != null && current.getWebView().isShowingCrashView())
+            current.getWebView().reload();
         mActivity.registerReceiver(mLowPowerReceiver, new IntentFilter(Intent.ACTION_BATTERY_LOW));
     }
 
@@ -2092,10 +2084,6 @@
                     stopLoading();
                 } else {
                     Tab currentTab = mTabControl.getCurrentTab();
-                    if (currentTab.hasCrashed) {
-                        currentTab.replaceCrashView(getCurrentTopWebView(),
-                            currentTab.getViewContainer());
-                    }
                     getCurrentTopWebView().reload();
                 }
                 break;
@@ -3210,9 +3198,6 @@
             dismissSubWindow(tab);
             mHomepageHandler.registerJsInterface(tab.getWebView(), url);
             tab.loadUrl(url, headers);
-            if (tab.hasCrashed) {
-                tab.replaceCrashView(tab.getWebView(), tab.getViewContainer());
-            }
             mUi.onProgressChanged(tab);
         }
     }