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

Side by Side Diff: chrome/browser/chromeos/ui/idle_logout_dialog_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/chromeos/ui/idle_logout_dialog_view.h" 5 #include "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 IdleLogoutDialogView::provider_->GetKioskModeSettings(); 114 IdleLogoutDialogView::provider_->GetKioskModeSettings();
115 if (!settings->is_initialized()) { 115 if (!settings->is_initialized()) {
116 settings->Initialize(base::Bind(&IdleLogoutDialogView::InitAndShow, 116 settings->Initialize(base::Bind(&IdleLogoutDialogView::InitAndShow,
117 weak_ptr_factory_.GetWeakPtr())); 117 weak_ptr_factory_.GetWeakPtr()));
118 return; 118 return;
119 } 119 }
120 120
121 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 121 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
122 122
123 restart_label_ = new views::Label(); 123 restart_label_ = new views::Label();
124 restart_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 124 restart_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
125 restart_label_->SetMultiLine(true); 125 restart_label_->SetMultiLine(true);
126 restart_label_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont)); 126 restart_label_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
127 127
128 views::GridLayout* layout = views::GridLayout::CreatePanel(this); 128 views::GridLayout* layout = views::GridLayout::CreatePanel(this);
129 SetLayoutManager(layout); 129 SetLayoutManager(layout);
130 130
131 views::ColumnSet* column_set = layout->AddColumnSet(0); 131 views::ColumnSet* column_set = layout->AddColumnSet(0);
132 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1, 132 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
133 views::GridLayout::FIXED, kIdleLogoutDialogMaxWidth, 0); 133 views::GridLayout::FIXED, kIdleLogoutDialogMaxWidth, 0);
134 layout->StartRow(0, 0); 134 layout->StartRow(0, 0);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 return g_instance; 203 return g_instance;
204 } 204 }
205 205
206 // static 206 // static
207 void IdleLogoutDialogView::set_settings_provider( 207 void IdleLogoutDialogView::set_settings_provider(
208 IdleLogoutSettingsProvider* provider) { 208 IdleLogoutSettingsProvider* provider) {
209 provider_ = provider; 209 provider_ = provider;
210 } 210 }
211 211
212 } // namespace chromeos 212 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wimax_config_view.cc ('k') | chrome/browser/first_run/try_chrome_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698