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

Side by Side Diff: chrome/browser/chromeos/login/background_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/background_view.h" 5 #include "chrome/browser/chromeos/login/background_view.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 // Overridden from LoginHtmlDialog::Delegate: 309 // Overridden from LoginHtmlDialog::Delegate:
310 void BackgroundView::OnLocaleChanged() { 310 void BackgroundView::OnLocaleChanged() {
311 // Proxy settings dialog contains localized strings. 311 // Proxy settings dialog contains localized strings.
312 proxy_settings_dialog_.reset(); 312 proxy_settings_dialog_.reset();
313 InitInfoLabels(); 313 InitInfoLabels();
314 SchedulePaint(); 314 SchedulePaint();
315 } 315 }
316 316
317 void BackgroundView::OnOSVersionLabelTextUpdated( 317 void BackgroundView::OnOSVersionLabelTextUpdated(
318 const std::string& os_version_label_text) { 318 const std::string& os_version_label_text) {
319 os_version_label_->SetText(UTF8ToWide(os_version_label_text)); 319 os_version_label_->SetText(UTF8ToUTF16(os_version_label_text));
320 } 320 }
321 321
322 void BackgroundView::OnBootTimesLabelTextUpdated( 322 void BackgroundView::OnBootTimesLabelTextUpdated(
323 const std::string& boot_times_label_text) { 323 const std::string& boot_times_label_text) {
324 boot_times_label_->SetText(UTF8ToWide(boot_times_label_text)); 324 boot_times_label_->SetText(UTF8ToUTF16(boot_times_label_text));
325 } 325 }
326 326
327 /////////////////////////////////////////////////////////////////////////////// 327 ///////////////////////////////////////////////////////////////////////////////
328 // BackgroundView private: 328 // BackgroundView private:
329 329
330 void BackgroundView::InitStatusArea() { 330 void BackgroundView::InitStatusArea() {
331 DCHECK(status_area_ == NULL); 331 DCHECK(status_area_ == NULL);
332 status_area_ = new StatusAreaView(this); 332 status_area_ = new StatusAreaView(this);
333 status_area_->Init(); 333 status_area_->Init();
334 AddChildView(status_area_); 334 AddChildView(status_area_);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 383
384 void BackgroundView::UpdateWindowType() { 384 void BackgroundView::UpdateWindowType() {
385 std::vector<int> params; 385 std::vector<int> params;
386 WmIpc::instance()->SetWindowType( 386 WmIpc::instance()->SetWindowType(
387 GTK_WIDGET(GetNativeWindow()), 387 GTK_WIDGET(GetNativeWindow()),
388 WM_IPC_WINDOW_LOGIN_BACKGROUND, 388 WM_IPC_WINDOW_LOGIN_BACKGROUND,
389 &params); 389 &params);
390 } 390 }
391 391
392 } // namespace chromeos 392 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/candidate_window.cc ('k') | chrome/browser/chromeos/login/captcha_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698