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

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

Issue 7377010: This change will split the result codes between content and chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: actually rename the files Created 9 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser_dialogs.h" 5 #include "chrome/browser/ui/browser_dialogs.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/favicon/favicon_tab_helper.h" 9 #include "chrome/browser/favicon/favicon_tab_helper.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 332
333 /////////////////////////////////////////////////////////////////////////////// 333 ///////////////////////////////////////////////////////////////////////////////
334 // HungRendererDialogView, views::ButtonListener implementation: 334 // HungRendererDialogView, views::ButtonListener implementation:
335 335
336 void HungRendererDialogView::ButtonPressed( 336 void HungRendererDialogView::ButtonPressed(
337 views::Button* sender, const views::Event& event) { 337 views::Button* sender, const views::Event& event) {
338 if (sender == kill_button_) { 338 if (sender == kill_button_) {
339 if (contents_ && contents_->GetRenderProcessHost()) { 339 if (contents_ && contents_->GetRenderProcessHost()) {
340 // Kill the process. 340 // Kill the process.
341 TerminateProcess(contents_->GetRenderProcessHost()->GetHandle(), 341 TerminateProcess(contents_->GetRenderProcessHost()->GetHandle(),
342 ResultCodes::HUNG); 342 content::RESULT_CODE_HUNG);
343 } 343 }
344 } 344 }
345 } 345 }
346 346
347 /////////////////////////////////////////////////////////////////////////////// 347 ///////////////////////////////////////////////////////////////////////////////
348 // HungRendererDialogView, views::View overrides: 348 // HungRendererDialogView, views::View overrides:
349 349
350 void HungRendererDialogView::ViewHierarchyChanged(bool is_add, 350 void HungRendererDialogView::ViewHierarchyChanged(bool is_add,
351 views::View* parent, 351 views::View* parent,
352 views::View* child) { 352 views::View* child) {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 g_instance->ShowForTabContents(contents); 480 g_instance->ShowForTabContents(contents);
481 } 481 }
482 } 482 }
483 483
484 void HideHungRendererDialog(TabContents* contents) { 484 void HideHungRendererDialog(TabContents* contents) {
485 if (!logging::DialogsAreSuppressed() && g_instance) 485 if (!logging::DialogsAreSuppressed() && g_instance)
486 g_instance->EndForTabContents(contents); 486 g_instance->EndForTabContents(contents);
487 } 487 }
488 488
489 } // namespace browser 489 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698