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

Side by Side Diff: chrome/browser/chromeos/login/take_photo_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/login/take_photo_view.h" 5 #include "chrome/browser/chromeos/login/take_photo_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/chromeos/login/helper.h" 8 #include "chrome/browser/chromeos/login/helper.h"
9 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 set_border(views::Border::CreateSolidBorder(1, kImageBorderColor)); 56 set_border(views::Border::CreateSolidBorder(1, kImageBorderColor));
57 set_background(views::Background::CreateSolidBackground(SK_ColorWHITE)); 57 set_background(views::Background::CreateSolidBackground(SK_ColorWHITE));
58 58
59 throbber_ = CreateDefaultSmoothedThrobber(); 59 throbber_ = CreateDefaultSmoothedThrobber();
60 throbber_->SetVisible(false); 60 throbber_->SetVisible(false);
61 AddChildView(throbber_); 61 AddChildView(throbber_);
62 62
63 message_ = new views::Label(); 63 message_ = new views::Label();
64 message_->SetMultiLine(true); 64 message_->SetMultiLine(true);
65 message_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 65 message_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
66 message_->SetVisible(false); 66 message_->SetVisible(false);
67 CorrectLabelFontSize(message_); 67 CorrectLabelFontSize(message_);
68 AddChildView(message_); 68 AddChildView(message_);
69 } 69 }
70 70
71 void SetInitializingState() { 71 void SetInitializingState() {
72 ShowThrobber(); 72 ShowThrobber();
73 SetMessage(string16()); 73 SetMessage(string16());
74 SetImage( 74 SetImage(
75 ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 75 ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 delegate_(delegate) { 155 delegate_(delegate) {
156 } 156 }
157 157
158 TakePhotoView::~TakePhotoView() { 158 TakePhotoView::~TakePhotoView() {
159 } 159 }
160 160
161 void TakePhotoView::Init(int image_width, int image_height) { 161 void TakePhotoView::Init(int image_width, int image_height) {
162 if (show_title_) { 162 if (show_title_) {
163 title_label_ = new views::Label( 163 title_label_ = new views::Label(
164 l10n_util::GetStringUTF16(IDS_USER_IMAGE_SCREEN_TITLE)); 164 l10n_util::GetStringUTF16(IDS_USER_IMAGE_SCREEN_TITLE));
165 title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); 165 title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
166 title_label_->SetMultiLine(true); 166 title_label_->SetMultiLine(true);
167 CorrectLabelFontSize(title_label_); 167 CorrectLabelFontSize(title_label_);
168 } 168 }
169 169
170 user_image_ = new CameraImageView(); 170 user_image_ = new CameraImageView();
171 user_image_->SetImageSize(gfx::Size(image_width, image_height)); 171 user_image_->SetImageSize(gfx::Size(image_width, image_height));
172 user_image_->Init(); 172 user_image_->Init();
173 173
174 snapshot_button_ = new views::ImageButton(this); 174 snapshot_button_ = new views::ImageButton(this);
175 snapshot_button_->set_focusable(true); 175 snapshot_button_->set_focusable(true);
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 snapshot_button_->SetImage( 294 snapshot_button_->SetImage(
295 views::CustomButton::BS_NORMAL, 295 views::CustomButton::BS_NORMAL,
296 ResourceBundle::GetSharedInstance().GetImageSkiaNamed( 296 ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
297 IDR_USER_IMAGE_CAPTURE)); 297 IDR_USER_IMAGE_CAPTURE));
298 delegate_->OnCapturingStarted(); 298 delegate_->OnCapturingStarted();
299 snapshot_button_->SchedulePaint(); 299 snapshot_button_->SchedulePaint();
300 } 300 }
301 } 301 }
302 302
303 } // namespace chromeos 303 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/password_changed_view.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698