| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 case chromeos::BackgroundView::REGISTRATION: | 65 case chromeos::BackgroundView::REGISTRATION: |
| 66 return IDS_OOBE_REGISTRATION; | 66 return IDS_OOBE_REGISTRATION; |
| 67 case chromeos::BackgroundView::PICTURE: | 67 case chromeos::BackgroundView::PICTURE: |
| 68 return IDS_OOBE_PICTURE; | 68 return IDS_OOBE_PICTURE; |
| 69 default: | 69 default: |
| 70 NOTREACHED(); | 70 NOTREACHED(); |
| 71 return 0; | 71 return 0; |
| 72 } | 72 } |
| 73 } | 73 } |
| 74 | 74 |
| 75 // This gets rid of the ugly X default cursor. | |
| 76 static void ResetXCursor() { | |
| 77 // TODO(sky): nuke this once new window manager is in place. | |
| 78 Display* display = ui::GetXDisplay(); | |
| 79 Cursor cursor = XCreateFontCursor(display, XC_left_ptr); | |
| 80 XID root_window = ui::GetX11RootWindow(); | |
| 81 XSetWindowAttributes attr; | |
| 82 attr.cursor = cursor; | |
| 83 XChangeWindowAttributes(display, root_window, CWCursor, &attr); | |
| 84 } | |
| 85 | |
| 86 } // namespace | 75 } // namespace |
| 87 | 76 |
| 88 namespace chromeos { | 77 namespace chromeos { |
| 89 | 78 |
| 90 /////////////////////////////////////////////////////////////////////////////// | 79 /////////////////////////////////////////////////////////////////////////////// |
| 91 // BackgroundView public: | 80 // BackgroundView public: |
| 92 | 81 |
| 93 BackgroundView::BackgroundView() | 82 BackgroundView::BackgroundView() |
| 94 : status_area_(NULL), | 83 : status_area_(NULL), |
| 95 os_version_label_(NULL), | 84 os_version_label_(NULL), |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 boot_times_label_->SetText(ASCIIToWide(boot_times_text)); | 527 boot_times_label_->SetText(ASCIIToWide(boot_times_text)); |
| 539 } | 528 } |
| 540 | 529 |
| 541 void BackgroundView::OnPolicyStateChanged( | 530 void BackgroundView::OnPolicyStateChanged( |
| 542 policy::CloudPolicySubsystem::PolicySubsystemState state, | 531 policy::CloudPolicySubsystem::PolicySubsystemState state, |
| 543 policy::CloudPolicySubsystem::ErrorDetails error_details) { | 532 policy::CloudPolicySubsystem::ErrorDetails error_details) { |
| 544 UpdateEnterpriseInfo(); | 533 UpdateEnterpriseInfo(); |
| 545 } | 534 } |
| 546 | 535 |
| 547 } // namespace chromeos | 536 } // namespace chromeos |
| OLD | NEW |