| OLD | NEW |
| 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 void HungRendererDialogView::Init() { | 372 void HungRendererDialogView::Init() { |
| 373 frozen_icon_view_ = new views::ImageView; | 373 frozen_icon_view_ = new views::ImageView; |
| 374 frozen_icon_view_->SetImage(frozen_icon_); | 374 frozen_icon_view_->SetImage(frozen_icon_); |
| 375 | 375 |
| 376 info_label_ = new views::Label( | 376 info_label_ = new views::Label( |
| 377 UTF16ToWide(l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER))); | 377 UTF16ToWide(l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER))); |
| 378 info_label_->SetMultiLine(true); | 378 info_label_->SetMultiLine(true); |
| 379 info_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 379 info_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
| 380 | 380 |
| 381 hung_pages_table_model_.reset(new HungPagesTableModel); | 381 hung_pages_table_model_.reset(new HungPagesTableModel); |
| 382 std::vector<TableColumn> columns; | 382 std::vector<ui::TableColumn> columns; |
| 383 columns.push_back(TableColumn()); | 383 columns.push_back(ui::TableColumn()); |
| 384 hung_pages_table_ = new views::GroupTableView( | 384 hung_pages_table_ = new views::GroupTableView( |
| 385 hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true, | 385 hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true, |
| 386 false, true, false); | 386 false, true, false); |
| 387 hung_pages_table_->SetPreferredSize( | 387 hung_pages_table_->SetPreferredSize( |
| 388 gfx::Size(kTableViewWidth, kTableViewHeight)); | 388 gfx::Size(kTableViewWidth, kTableViewHeight)); |
| 389 | 389 |
| 390 CreateKillButtonView(); | 390 CreateKillButtonView(); |
| 391 | 391 |
| 392 using views::GridLayout; | 392 using views::GridLayout; |
| 393 using views::ColumnSet; | 393 using views::ColumnSet; |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |