| OLD | NEW |
| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 // Overridden from LoginHtmlDialog::Delegate: | 302 // Overridden from LoginHtmlDialog::Delegate: |
| 303 void BackgroundView::OnLocaleChanged() { | 303 void BackgroundView::OnLocaleChanged() { |
| 304 // Proxy settings dialog contains localized strings. | 304 // Proxy settings dialog contains localized strings. |
| 305 proxy_settings_dialog_.reset(); | 305 proxy_settings_dialog_.reset(); |
| 306 InitInfoLabels(); | 306 InitInfoLabels(); |
| 307 SchedulePaint(); | 307 SchedulePaint(); |
| 308 } | 308 } |
| 309 | 309 |
| 310 void BackgroundView::OnOSVersionLabelTextUpdated( | 310 void BackgroundView::OnOSVersionLabelTextUpdated( |
| 311 const std::string& os_version_label_text) { | 311 const std::string& os_version_label_text) { |
| 312 os_version_label_->SetText(ASCIIToWide(os_version_label_text)); | 312 os_version_label_->SetText(UTF8ToWide(os_version_label_text)); |
| 313 } | 313 } |
| 314 | 314 |
| 315 void BackgroundView::OnBootTimesLabelTextUpdated( | 315 void BackgroundView::OnBootTimesLabelTextUpdated( |
| 316 const std::string& boot_times_label_text) { | 316 const std::string& boot_times_label_text) { |
| 317 boot_times_label_->SetText(ASCIIToWide(boot_times_label_text)); | 317 boot_times_label_->SetText(UTF8ToWide(boot_times_label_text)); |
| 318 } | 318 } |
| 319 | 319 |
| 320 /////////////////////////////////////////////////////////////////////////////// | 320 /////////////////////////////////////////////////////////////////////////////// |
| 321 // BackgroundView private: | 321 // BackgroundView private: |
| 322 | 322 |
| 323 void BackgroundView::InitStatusArea() { | 323 void BackgroundView::InitStatusArea() { |
| 324 DCHECK(status_area_ == NULL); | 324 DCHECK(status_area_ == NULL); |
| 325 status_area_ = new StatusAreaView(this); | 325 status_area_ = new StatusAreaView(this); |
| 326 status_area_->Init(); | 326 status_area_->Init(); |
| 327 AddChildView(status_area_); | 327 AddChildView(status_area_); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 | 376 |
| 377 void BackgroundView::UpdateWindowType() { | 377 void BackgroundView::UpdateWindowType() { |
| 378 std::vector<int> params; | 378 std::vector<int> params; |
| 379 WmIpc::instance()->SetWindowType( | 379 WmIpc::instance()->SetWindowType( |
| 380 GTK_WIDGET(GetNativeWindow()), | 380 GTK_WIDGET(GetNativeWindow()), |
| 381 WM_IPC_WINDOW_LOGIN_BACKGROUND, | 381 WM_IPC_WINDOW_LOGIN_BACKGROUND, |
| 382 ¶ms); | 382 ¶ms); |
| 383 } | 383 } |
| 384 | 384 |
| 385 } // namespace chromeos | 385 } // namespace chromeos |
| OLD | NEW |