| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 } // namespace | 70 } // namespace |
| 71 | 71 |
| 72 namespace chromeos { | 72 namespace chromeos { |
| 73 | 73 |
| 74 /////////////////////////////////////////////////////////////////////////////// | 74 /////////////////////////////////////////////////////////////////////////////// |
| 75 // BackgroundView public: | 75 // BackgroundView public: |
| 76 | 76 |
| 77 BackgroundView::BackgroundView() | 77 BackgroundView::BackgroundView() |
| 78 : status_area_(NULL), | 78 : status_area_(NULL), |
| 79 screen_mode_(StatusAreaViewChromeos::LOGIN_MODE_VIEWS), | |
| 80 os_version_label_(NULL), | 79 os_version_label_(NULL), |
| 81 boot_times_label_(NULL), | 80 boot_times_label_(NULL), |
| 82 shutdown_button_(NULL), | 81 shutdown_button_(NULL), |
| 83 #if defined(OFFICIAL_BUILD) | 82 #if defined(OFFICIAL_BUILD) |
| 84 is_official_build_(true), | 83 is_official_build_(true), |
| 85 #else | 84 #else |
| 86 is_official_build_(false), | 85 is_official_build_(false), |
| 87 #endif | 86 #endif |
| 88 background_area_(NULL), | 87 background_area_(NULL), |
| 89 version_info_updater_(this) { | 88 version_info_updater_(this) { |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 const std::string& boot_times_label_text) { | 287 const std::string& boot_times_label_text) { |
| 289 boot_times_label_->SetText(UTF8ToUTF16(boot_times_label_text)); | 288 boot_times_label_->SetText(UTF8ToUTF16(boot_times_label_text)); |
| 290 } | 289 } |
| 291 | 290 |
| 292 /////////////////////////////////////////////////////////////////////////////// | 291 /////////////////////////////////////////////////////////////////////////////// |
| 293 // BackgroundView private: | 292 // BackgroundView private: |
| 294 | 293 |
| 295 void BackgroundView::InitStatusArea() { | 294 void BackgroundView::InitStatusArea() { |
| 296 DCHECK(status_area_ == NULL); | 295 DCHECK(status_area_ == NULL); |
| 297 status_area_ = new StatusAreaViewChromeos(); | 296 status_area_ = new StatusAreaViewChromeos(); |
| 298 status_area_->Init(this, screen_mode_); | 297 status_area_->Init(this); |
| 299 AddChildView(status_area_); | 298 AddChildView(status_area_); |
| 300 } | 299 } |
| 301 | 300 |
| 302 void BackgroundView::InitInfoLabels() { | 301 void BackgroundView::InitInfoLabels() { |
| 303 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 302 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 304 | 303 |
| 305 { | 304 { |
| 306 int idx = GetIndexOf(os_version_label_); | 305 int idx = GetIndexOf(os_version_label_); |
| 307 delete os_version_label_; | 306 delete os_version_label_; |
| 308 os_version_label_ = new views::Label(); | 307 os_version_label_ = new views::Label(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 336 #if defined(TOOLKIT_USES_GTK) | 335 #if defined(TOOLKIT_USES_GTK) |
| 337 std::vector<int> params; | 336 std::vector<int> params; |
| 338 WmIpc::instance()->SetWindowType( | 337 WmIpc::instance()->SetWindowType( |
| 339 GTK_WIDGET(GetNativeWindow()), | 338 GTK_WIDGET(GetNativeWindow()), |
| 340 WM_IPC_WINDOW_LOGIN_BACKGROUND, | 339 WM_IPC_WINDOW_LOGIN_BACKGROUND, |
| 341 ¶ms); | 340 ¶ms); |
| 342 #endif | 341 #endif |
| 343 } | 342 } |
| 344 | 343 |
| 345 } // namespace chromeos | 344 } // namespace chromeos |
| OLD | NEW |