| 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/common/system/ime/tray_ime_chromeos.h" | 5 #include "ash/common/system/ime/tray_ime_chromeos.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 93 |
| 94 protected: | 94 protected: |
| 95 // TrayItemMore: | 95 // TrayItemMore: |
| 96 void UpdateStyle() override { | 96 void UpdateStyle() override { |
| 97 TrayItemMore::UpdateStyle(); | 97 TrayItemMore::UpdateStyle(); |
| 98 | 98 |
| 99 if (!MaterialDesignController::IsSystemTrayMenuMaterial()) | 99 if (!MaterialDesignController::IsSystemTrayMenuMaterial()) |
| 100 return; | 100 return; |
| 101 | 101 |
| 102 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle(); | 102 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle(); |
| 103 SetImage(gfx::CreateVectorIcon(kSystemMenuKeyboardIcon, | 103 SetImage( |
| 104 style->GetForegroundColor())); | 104 gfx::CreateVectorIcon(kSystemMenuKeyboardIcon, style->GetIconColor())); |
| 105 } | 105 } |
| 106 | 106 |
| 107 private: | 107 private: |
| 108 DISALLOW_COPY_AND_ASSIGN(IMEDefaultView); | 108 DISALLOW_COPY_AND_ASSIGN(IMEDefaultView); |
| 109 }; | 109 }; |
| 110 | 110 |
| 111 class IMEDetailedView : public ImeListView { | 111 class IMEDetailedView : public ImeListView { |
| 112 public: | 112 public: |
| 113 IMEDetailedView(SystemTrayItem* owner, | 113 IMEDetailedView(SystemTrayItem* owner, |
| 114 LoginStatus login, | 114 LoginStatus login, |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 else | 333 else |
| 334 Update(); | 334 Update(); |
| 335 } | 335 } |
| 336 | 336 |
| 337 bool TrayIME::ShouldDefaultViewBeVisible() { | 337 bool TrayIME::ShouldDefaultViewBeVisible() { |
| 338 return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 || | 338 return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 || |
| 339 ShouldShowKeyboardToggle()); | 339 ShouldShowKeyboardToggle()); |
| 340 } | 340 } |
| 341 | 341 |
| 342 } // namespace ash | 342 } // namespace ash |
| OLD | NEW |