| 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_chromeos.h" | 5 #include "ash/system/ime/tray_ime_chromeos.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" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 default_ = NULL; | 345 default_ = NULL; |
| 346 } | 346 } |
| 347 | 347 |
| 348 void TrayIME::DestroyDetailedView() { | 348 void TrayIME::DestroyDetailedView() { |
| 349 detailed_ = NULL; | 349 detailed_ = NULL; |
| 350 } | 350 } |
| 351 | 351 |
| 352 void TrayIME::UpdateAfterLoginStatusChange(user::LoginStatus status) { | 352 void TrayIME::UpdateAfterLoginStatusChange(user::LoginStatus status) { |
| 353 } | 353 } |
| 354 | 354 |
| 355 void TrayIME::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { | 355 void TrayIME::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) { |
| 356 SetTrayLabelItemBorder(tray_label_, alignment); | 356 SetTrayLabelItemBorder(tray_label_, alignment); |
| 357 tray_label_->Layout(); | 357 tray_label_->Layout(); |
| 358 } | 358 } |
| 359 | 359 |
| 360 void TrayIME::OnIMERefresh() { | 360 void TrayIME::OnIMERefresh() { |
| 361 // Caches the current ime state. | 361 // Caches the current ime state. |
| 362 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); | 362 SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate(); |
| 363 ime_list_.clear(); | 363 ime_list_.clear(); |
| 364 property_list_.clear(); | 364 property_list_.clear(); |
| 365 delegate->GetCurrentIME(¤t_ime_); | 365 delegate->GetCurrentIME(¤t_ime_); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 376 else | 376 else |
| 377 Update(); | 377 Update(); |
| 378 } | 378 } |
| 379 | 379 |
| 380 bool TrayIME::ShouldDefaultViewBeVisible() { | 380 bool TrayIME::ShouldDefaultViewBeVisible() { |
| 381 return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 || | 381 return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 || |
| 382 ShouldShowKeyboardToggle()); | 382 ShouldShowKeyboardToggle()); |
| 383 } | 383 } |
| 384 | 384 |
| 385 } // namespace ash | 385 } // namespace ash |
| OLD | NEW |