Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: ash/common/system/ime/tray_ime_chromeos.cc

Issue 2496963004: [ash-md] Fixed the effective text/icon colors in the system menu. (Closed)
Patch Set: Fixed compile error (typo). Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/common/system/chromeos/tray_tracing.cc ('k') | ash/common/system/tray/tray_item_more.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/tray_tracing.cc ('k') | ash/common/system/tray/tray_item_more.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698