| OLD | NEW |
| 1 // Copyright (c) 2010 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/hung_renderer_dialog.h" | 5 #include "chrome/browser/hung_renderer_dialog.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "base/i18n/rtl.h" | 8 #include "base/i18n/rtl.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/browser_list.h" | 10 #include "chrome/browser/browser_list.h" |
| 11 #include "chrome/browser/renderer_host/render_process_host.h" | 11 #include "chrome/browser/renderer_host/render_process_host.h" |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true, | 357 hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true, |
| 358 false, true, false); | 358 false, true, false); |
| 359 hung_pages_table_->SetPreferredSize( | 359 hung_pages_table_->SetPreferredSize( |
| 360 gfx::Size(kTableViewWidth, kTableViewHeight)); | 360 gfx::Size(kTableViewWidth, kTableViewHeight)); |
| 361 | 361 |
| 362 CreateKillButtonView(); | 362 CreateKillButtonView(); |
| 363 | 363 |
| 364 using views::GridLayout; | 364 using views::GridLayout; |
| 365 using views::ColumnSet; | 365 using views::ColumnSet; |
| 366 | 366 |
| 367 GridLayout* layout = CreatePanelGridLayout(this); | 367 GridLayout* layout = GridLayout::CreatePanel(this); |
| 368 SetLayoutManager(layout); | 368 SetLayoutManager(layout); |
| 369 | 369 |
| 370 const int double_column_set_id = 0; | 370 const int double_column_set_id = 0; |
| 371 ColumnSet* column_set = layout->AddColumnSet(double_column_set_id); | 371 ColumnSet* column_set = layout->AddColumnSet(double_column_set_id); |
| 372 column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0, | 372 column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0, |
| 373 GridLayout::FIXED, frozen_icon_->width(), 0); | 373 GridLayout::FIXED, frozen_icon_->width(), 0); |
| 374 column_set->AddPaddingColumn(0, kUnrelatedControlLargeHorizontalSpacing); | 374 column_set->AddPaddingColumn(0, kUnrelatedControlLargeHorizontalSpacing); |
| 375 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 375 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 376 GridLayout::USE_PREF, 0, 0); | 376 GridLayout::USE_PREF, 0, 0); |
| 377 | 377 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 } | 457 } |
| 458 | 458 |
| 459 // static | 459 // static |
| 460 void HideForTabContents(TabContents* contents) { | 460 void HideForTabContents(TabContents* contents) { |
| 461 if (!logging::DialogsAreSuppressed() && g_instance) | 461 if (!logging::DialogsAreSuppressed() && g_instance) |
| 462 g_instance->EndForTabContents(contents); | 462 g_instance->EndForTabContents(contents); |
| 463 } | 463 } |
| 464 | 464 |
| 465 } // namespace hung_renderer_dialog | 465 } // namespace hung_renderer_dialog |
| 466 | 466 |
| OLD | NEW |