Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(546)

Side by Side Diff: chrome/browser/ui/views/hung_renderer_view.cc

Issue 257153003: We have a problem in the process on destroying WebContentsImpl because (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Rebased onto origin/lkgr Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/ui/views/hung_renderer_view.h" 5 #include "chrome/browser/ui/views/hung_renderer_view.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/favicon/favicon_tab_helper.h" 10 #include "chrome/browser/favicon/favicon_tab_helper.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 HungPagesTableModel* model, WebContents* tab) 149 HungPagesTableModel* model, WebContents* tab)
150 : content::WebContentsObserver(tab), 150 : content::WebContentsObserver(tab),
151 model_(model) { 151 model_(model) {
152 } 152 }
153 153
154 void HungPagesTableModel::WebContentsObserverImpl::RenderProcessGone( 154 void HungPagesTableModel::WebContentsObserverImpl::RenderProcessGone(
155 base::TerminationStatus status) { 155 base::TerminationStatus status) {
156 model_->TabDestroyed(this); 156 model_->TabDestroyed(this);
157 } 157 }
158 158
159 void HungPagesTableModel::WebContentsObserverImpl::WebContentsDestroyed( 159 void HungPagesTableModel::WebContentsObserverImpl::WebContentsDestroyed() {
160 WebContents* tab) {
161 model_->TabDestroyed(this); 160 model_->TabDestroyed(this);
162 } 161 }
163 162
164 /////////////////////////////////////////////////////////////////////////////// 163 ///////////////////////////////////////////////////////////////////////////////
165 // HungRendererDialogView 164 // HungRendererDialogView
166 165
167 // static 166 // static
168 gfx::ImageSkia* HungRendererDialogView::frozen_icon_ = NULL; 167 gfx::ImageSkia* HungRendererDialogView::frozen_icon_ = NULL;
169 168
170 // The dimensions of the hung pages list table view, in pixels. 169 // The dimensions of the hung pages list table view, in pixels.
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 HungRendererDialogView* view = HungRendererDialogView::Create(toplevel_view); 449 HungRendererDialogView* view = HungRendererDialogView::Create(toplevel_view);
451 view->ShowForWebContents(contents); 450 view->ShowForWebContents(contents);
452 } 451 }
453 452
454 void HideHungRendererDialog(WebContents* contents) { 453 void HideHungRendererDialog(WebContents* contents) {
455 if (!logging::DialogsAreSuppressed() && HungRendererDialogView::GetInstance()) 454 if (!logging::DialogsAreSuppressed() && HungRendererDialogView::GetInstance())
456 HungRendererDialogView::GetInstance()->EndForWebContents(contents); 455 HungRendererDialogView::GetInstance()->EndForWebContents(contents);
457 } 456 }
458 457
459 } // namespace chrome 458 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698