diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 19:33:33 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 19:33:33 +0000 |
| commit | 8f59af9841bc6c76e9b1b32ac9138ab621b5d0ad (patch) | |
| tree | bb85f5fb99688fd192c8a115d9ad53d24b978e3d /content | |
| parent | dcc02d95f0953b2c0cd15d99b22c0e6b4101b2e7 (diff) | |
| download | chromium_src-8f59af9841bc6c76e9b1b32ac9138ab621b5d0ad.zip chromium_src-8f59af9841bc6c76e9b1b32ac9138ab621b5d0ad.tar.gz chromium_src-8f59af9841bc6c76e9b1b32ac9138ab621b5d0ad.tar.bz2 | |
Fix site_instance DCHECK when loading restored tabs.
Reload does not call the proper initialization bits required to
bring the navigation_entries back to life. Need to call LoadIfNecessary()
as called in session_restore (TabLoader::LoadNextTab) on desktop.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11293025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/android/content_view_core_impl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 9a88630..94ceaad 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -870,7 +870,10 @@ void ContentViewCoreImpl::StopLoading(JNIEnv* env, jobject obj) { void ContentViewCoreImpl::Reload(JNIEnv* env, jobject obj) { // Set check_for_repost parameter to false as we have no repost confirmation // dialog ("confirm form resubmission" screen will still appear, however). - web_contents_->GetController().Reload(true); + if (web_contents_->GetController().NeedsReload()) + web_contents_->GetController().LoadIfNecessary(); + else + web_contents_->GetController().Reload(true); tab_crashed_ = false; } |