| 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/ime/tray_ime.h" | 5 #include "ash/system/ime/tray_ime.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/metrics/user_metrics_recorder.h" | 9 #include "ash/metrics/user_metrics_recorder.h" |
| 10 #include "ash/root_window_controller.h" | 10 #include "ash/root_window_controller.h" |
| 11 #include "ash/session/session_state_delegate.h" |
| 11 #include "ash/shelf/shelf_widget.h" | 12 #include "ash/shelf/shelf_widget.h" |
| 12 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 13 #include "ash/system/tray/hover_highlight_view.h" | 14 #include "ash/system/tray/hover_highlight_view.h" |
| 14 #include "ash/system/tray/system_tray.h" | 15 #include "ash/system/tray/system_tray.h" |
| 15 #include "ash/system/tray/system_tray_delegate.h" | 16 #include "ash/system/tray/system_tray_delegate.h" |
| 16 #include "ash/system/tray/system_tray_notifier.h" | 17 #include "ash/system/tray/system_tray_notifier.h" |
| 17 #include "ash/system/tray/tray_constants.h" | 18 #include "ash/system/tray/tray_constants.h" |
| 18 #include "ash/system/tray/tray_details_view.h" | 19 #include "ash/system/tray/tray_details_view.h" |
| 19 #include "ash/system/tray/tray_item_more.h" | 20 #include "ash/system/tray/tray_item_more.h" |
| 20 #include "ash/system/tray/tray_item_view.h" | 21 #include "ash/system/tray/tray_item_view.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 108 |
| 108 virtual ~IMEDetailedView() {} | 109 virtual ~IMEDetailedView() {} |
| 109 | 110 |
| 110 void Update(const IMEInfoList& list, | 111 void Update(const IMEInfoList& list, |
| 111 const IMEPropertyInfoList& property_list) { | 112 const IMEPropertyInfoList& property_list) { |
| 112 Reset(); | 113 Reset(); |
| 113 | 114 |
| 114 AppendIMEList(list); | 115 AppendIMEList(list); |
| 115 if (!property_list.empty()) | 116 if (!property_list.empty()) |
| 116 AppendIMEProperties(property_list); | 117 AppendIMEProperties(property_list); |
| 117 if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED) | 118 if (login_ != user::LOGGED_IN_NONE && login_ != user::LOGGED_IN_LOCKED && |
| 119 ash::Shell::GetInstance() |
| 120 ->session_state_delegate() |
| 121 ->GetSessionState() != |
| 122 ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY) |
| 118 AppendSettings(); | 123 AppendSettings(); |
| 119 AppendHeaderEntry(); | 124 AppendHeaderEntry(); |
| 120 | 125 |
| 121 Layout(); | 126 Layout(); |
| 122 SchedulePaint(); | 127 SchedulePaint(); |
| 123 } | 128 } |
| 124 | 129 |
| 125 private: | 130 private: |
| 126 void AppendHeaderEntry() { | 131 void AppendHeaderEntry() { |
| 127 CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this); | 132 CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this); |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 | 299 |
| 295 UpdateTrayLabel(current, list.size()); | 300 UpdateTrayLabel(current, list.size()); |
| 296 | 301 |
| 297 if (default_) | 302 if (default_) |
| 298 default_->UpdateLabel(current); | 303 default_->UpdateLabel(current); |
| 299 if (detailed_) | 304 if (detailed_) |
| 300 detailed_->Update(list, property_list); | 305 detailed_->Update(list, property_list); |
| 301 } | 306 } |
| 302 | 307 |
| 303 } // namespace ash | 308 } // namespace ash |
| OLD | NEW |