| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/hung_renderer_view.h" | 5 #include "chrome/browser/views/hung_renderer_view.h" |
| 6 | 6 |
| 7 #include "chrome/app/result_codes.h" | 7 #include "chrome/app/result_codes.h" |
| 8 #include "chrome/app/theme/theme_resources.h" | 8 #include "chrome/app/theme/theme_resources.h" |
| 9 #include "chrome/browser/browser_list.h" | 9 #include "chrome/browser/browser_list.h" |
| 10 #include "chrome/browser/render_view_host.h" | 10 #include "chrome/browser/render_view_host.h" |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 l10n_util::GetString(IDS_BROWSER_HANGMONITOR_RENDERER)); | 336 l10n_util::GetString(IDS_BROWSER_HANGMONITOR_RENDERER)); |
| 337 info_label_->SetMultiLine(true); | 337 info_label_->SetMultiLine(true); |
| 338 info_label_->SetHorizontalAlignment(ChromeViews::Label::ALIGN_LEFT); | 338 info_label_->SetHorizontalAlignment(ChromeViews::Label::ALIGN_LEFT); |
| 339 | 339 |
| 340 hung_pages_table_model_.reset(new HungPagesTableModel); | 340 hung_pages_table_model_.reset(new HungPagesTableModel); |
| 341 std::vector<ChromeViews::TableColumn> columns; | 341 std::vector<ChromeViews::TableColumn> columns; |
| 342 columns.push_back(ChromeViews::TableColumn()); | 342 columns.push_back(ChromeViews::TableColumn()); |
| 343 hung_pages_table_ = new ChromeViews::GroupTableView( | 343 hung_pages_table_ = new ChromeViews::GroupTableView( |
| 344 hung_pages_table_model_.get(), columns, ChromeViews::ICON_AND_TEXT, true, | 344 hung_pages_table_model_.get(), columns, ChromeViews::ICON_AND_TEXT, true, |
| 345 false, true); | 345 false, true); |
| 346 hung_pages_table_->SetPreferredSize( | 346 hung_pages_table_->set_preferred_size( |
| 347 CSize(kTableViewWidth, kTableViewHeight)); | 347 gfx::Size(kTableViewWidth, kTableViewHeight)); |
| 348 | 348 |
| 349 CreateKillButtonView(); | 349 CreateKillButtonView(); |
| 350 | 350 |
| 351 using ChromeViews::GridLayout; | 351 using ChromeViews::GridLayout; |
| 352 using ChromeViews::ColumnSet; | 352 using ChromeViews::ColumnSet; |
| 353 | 353 |
| 354 GridLayout* layout = CreatePanelGridLayout(this); | 354 GridLayout* layout = CreatePanelGridLayout(this); |
| 355 SetLayoutManager(layout); | 355 SetLayoutManager(layout); |
| 356 | 356 |
| 357 const int double_column_set_id = 0; | 357 const int double_column_set_id = 0; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 instance_->ShowForWebContents(contents); | 445 instance_->ShowForWebContents(contents); |
| 446 } | 446 } |
| 447 } | 447 } |
| 448 | 448 |
| 449 // static | 449 // static |
| 450 void HungRendererWarning::HideForWebContents(WebContents* contents) { | 450 void HungRendererWarning::HideForWebContents(WebContents* contents) { |
| 451 if (!logging::DialogsAreSuppressed() && instance_) | 451 if (!logging::DialogsAreSuppressed() && instance_) |
| 452 instance_->EndForWebContents(contents); | 452 instance_->EndForWebContents(contents); |
| 453 } | 453 } |
| 454 | 454 |
| OLD | NEW |