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

Side by Side Diff: chrome/browser/chromeos/login/take_photo_view.cc

Issue 8113031: Change std::wstring to string16 for views::Label and views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 2 months 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) 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/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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 } 101 }
102 102
103 void HideThrobber() { 103 void HideThrobber() {
104 DCHECK(throbber_); 104 DCHECK(throbber_);
105 throbber_->Stop(); 105 throbber_->Stop();
106 throbber_->SetVisible(false); 106 throbber_->SetVisible(false);
107 } 107 }
108 108
109 void SetMessage(const std::wstring& message) { 109 void SetMessage(const std::wstring& message) {
110 DCHECK(message_); 110 DCHECK(message_);
111 message_->SetText(message); 111 message_->SetText(WideToUTF16Hack(message));
112 message_->SetVisible(!message.empty()); 112 message_->SetVisible(!message.empty());
113 Layout(); 113 Layout();
114 } 114 }
115 115
116 // views::View override: 116 // views::View override:
117 virtual void Layout() { 117 virtual void Layout() {
118 gfx::Size size = GetPreferredSize(); 118 gfx::Size size = GetPreferredSize();
119 if (throbber_->IsVisible()) { 119 if (throbber_->IsVisible()) {
120 gfx::Size throbber_size = throbber_->GetPreferredSize(); 120 gfx::Size throbber_size = throbber_->GetPreferredSize();
121 int throbber_x = (size.width() - throbber_size.width()) / 2; 121 int throbber_x = (size.width() - throbber_size.width()) / 2;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 show_title_(true), 154 show_title_(true),
155 delegate_(delegate) { 155 delegate_(delegate) {
156 } 156 }
157 157
158 TakePhotoView::~TakePhotoView() { 158 TakePhotoView::~TakePhotoView() {
159 } 159 }
160 160
161 void TakePhotoView::Init() { 161 void TakePhotoView::Init() {
162 if (show_title_) { 162 if (show_title_) {
163 title_label_ = new views::Label( 163 title_label_ = new views::Label(
164 UTF16ToWide(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(views::Label::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( 171 user_image_->SetImageSize(
172 gfx::Size(login::kUserImageSize, login::kUserImageSize)); 172 gfx::Size(login::kUserImageSize, login::kUserImageSize));
173 user_image_->Init(); 173 user_image_->Init();
174 174
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 snapshot_button_->SetImage( 301 snapshot_button_->SetImage(
302 views::CustomButton::BS_NORMAL, 302 views::CustomButton::BS_NORMAL,
303 ResourceBundle::GetSharedInstance().GetBitmapNamed( 303 ResourceBundle::GetSharedInstance().GetBitmapNamed(
304 IDR_USER_IMAGE_CAPTURE)); 304 IDR_USER_IMAGE_CAPTURE));
305 delegate_->OnCapturingStarted(); 305 delegate_->OnCapturingStarted();
306 snapshot_button_->SchedulePaint(); 306 snapshot_button_->SchedulePaint();
307 } 307 }
308 } 308 }
309 309
310 } // namespace chromeos 310 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/password_changed_view.cc ('k') | chrome/browser/chromeos/login/update_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698