OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/system/chromeos/tray_display.h" | 5 #include "ash/system/chromeos/tray_display.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/content/display/screen_orientation_controller_chromeos.h" | 9 #include "ash/content/display/screen_orientation_controller_chromeos.h" |
10 #include "ash/display/display_controller.h" | 10 #include "ash/display/display_controller.h" |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 lines.push_back(GetDisplayInfoLine(internal_id)); | 101 lines.push_back(GetDisplayInfoLine(internal_id)); |
102 } | 102 } |
103 | 103 |
104 for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) { | 104 for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) { |
105 int64 id = display_manager->GetDisplayAt(i).id(); | 105 int64 id = display_manager->GetDisplayAt(i).id(); |
106 if (id == internal_id) | 106 if (id == internal_id) |
107 continue; | 107 continue; |
108 lines.push_back(GetDisplayInfoLine(id)); | 108 lines.push_back(GetDisplayInfoLine(id)); |
109 } | 109 } |
110 | 110 |
111 return JoinString(lines, '\n'); | 111 return base::JoinString(lines, base::ASCIIToUTF16("\n")); |
112 } | 112 } |
113 | 113 |
114 void OpenSettings() { | 114 void OpenSettings() { |
115 // switch is intentionally introduced without default, to cause an error when | 115 // switch is intentionally introduced without default, to cause an error when |
116 // a new type of login status is introduced. | 116 // a new type of login status is introduced. |
117 switch (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus()) { | 117 switch (Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus()) { |
118 case user::LOGGED_IN_NONE: | 118 case user::LOGGED_IN_NONE: |
119 case user::LOGGED_IN_LOCKED: | 119 case user::LOGGED_IN_LOCKED: |
120 return; | 120 return; |
121 | 121 |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) { | 447 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) { |
448 views::View* view = default_; | 448 views::View* view = default_; |
449 if (view) { | 449 if (view) { |
450 view->GetAccessibleState(state); | 450 view->GetAccessibleState(state); |
451 return true; | 451 return true; |
452 } | 452 } |
453 return false; | 453 return false; |
454 } | 454 } |
455 | 455 |
456 } // namespace ash | 456 } // namespace ash |
OLD | NEW |