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

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

Issue 11377005: Replace Label::Alignment with gfx::HorizontalAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix remaining Label::Alignment references. Created 8 years, 1 month 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) 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 #if defined(OS_WIN) && !defined(USE_AURA) 7 #if defined(OS_WIN) && !defined(USE_AURA)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 /////////////////////////////////////////////////////////////////////////////// 361 ///////////////////////////////////////////////////////////////////////////////
362 // HungRendererDialogView, private: 362 // HungRendererDialogView, private:
363 363
364 void HungRendererDialogView::Init() { 364 void HungRendererDialogView::Init() {
365 views::ImageView* frozen_icon_view = new views::ImageView; 365 views::ImageView* frozen_icon_view = new views::ImageView;
366 frozen_icon_view->SetImage(frozen_icon_); 366 frozen_icon_view->SetImage(frozen_icon_);
367 367
368 views::Label* info_label = new views::Label( 368 views::Label* info_label = new views::Label(
369 l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER)); 369 l10n_util::GetStringUTF16(IDS_BROWSER_HANGMONITOR_RENDERER));
370 info_label->SetMultiLine(true); 370 info_label->SetMultiLine(true);
371 info_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 371 info_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
372 372
373 hung_pages_table_model_.reset(new HungPagesTableModel(this)); 373 hung_pages_table_model_.reset(new HungPagesTableModel(this));
374 std::vector<ui::TableColumn> columns; 374 std::vector<ui::TableColumn> columns;
375 columns.push_back(ui::TableColumn()); 375 columns.push_back(ui::TableColumn());
376 hung_pages_table_ = new views::GroupTableView( 376 hung_pages_table_ = new views::GroupTableView(
377 hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true, 377 hung_pages_table_model_.get(), columns, views::ICON_AND_TEXT, true,
378 false, true, false); 378 false, true, false);
379 379
380 CreateKillButtonView(); 380 CreateKillButtonView();
381 381
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 } 474 }
475 475
476 void HideHungRendererDialog(WebContents* contents) { 476 void HideHungRendererDialog(WebContents* contents) {
477 if (!logging::DialogsAreSuppressed() && 477 if (!logging::DialogsAreSuppressed() &&
478 !PlatformHideCustomHungRendererDialog(contents) && 478 !PlatformHideCustomHungRendererDialog(contents) &&
479 HungRendererDialogView::GetInstance()) 479 HungRendererDialogView::GetInstance())
480 HungRendererDialogView::GetInstance()->EndForWebContents(contents); 480 HungRendererDialogView::GetInstance()->EndForWebContents(contents);
481 } 481 }
482 482
483 } // namespace chrome 483 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/global_error_bubble_view.cc ('k') | chrome/browser/ui/views/importer/import_lock_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698