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

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

Issue 2793153004: [Ash] Remove non-MD code from ImeListView and ImeListItemView (Closed)
Patch Set: class level docs for KeyboardStatusRow Created 3 years, 8 months 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/ime/tray_ime_chromeos.h ('k') | ash/common/system/tray/tray_constants.h » ('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/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/system/tray/system_tray.h" 10 #include "ash/common/system/tray/system_tray.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle(); 64 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
65 SetImage( 65 SetImage(
66 gfx::CreateVectorIcon(kSystemMenuKeyboardIcon, style->GetIconColor())); 66 gfx::CreateVectorIcon(kSystemMenuKeyboardIcon, style->GetIconColor()));
67 } 67 }
68 68
69 private: 69 private:
70 DISALLOW_COPY_AND_ASSIGN(IMEDefaultView); 70 DISALLOW_COPY_AND_ASSIGN(IMEDefaultView);
71 }; 71 };
72 72
73 // A list of available IMEs shown in the IME detailed view of the system menu,
74 // along with other items in the title row (a settings button and optional
75 // enterprise-controlled icon).
73 class IMEDetailedView : public ImeListView { 76 class IMEDetailedView : public ImeListView {
74 public: 77 public:
75 IMEDetailedView(SystemTrayItem* owner, LoginStatus login) 78 IMEDetailedView(SystemTrayItem* owner, LoginStatus login)
76 : ImeListView(owner), login_(login), settings_button_(nullptr) {} 79 : ImeListView(owner), login_(login), settings_button_(nullptr) {}
77 80
78 ~IMEDetailedView() override {} 81 ~IMEDetailedView() override {}
79 82
80 void SetImeManagedMessage(base::string16 ime_managed_message) { 83 void SetImeManagedMessage(base::string16 ime_managed_message) {
81 ime_managed_message_ = ime_managed_message; 84 ime_managed_message_ = ime_managed_message;
82 } 85 }
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 return ime_count >= threshold; 302 return ime_count >= threshold;
300 } 303 }
301 304
302 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() { 305 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() {
303 // If managed, we also want to show a single IME. 306 // If managed, we also want to show a single IME.
304 return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME 307 return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME
305 : ImeListView::HIDE_SINGLE_IME; 308 : ImeListView::HIDE_SINGLE_IME;
306 } 309 }
307 310
308 } // namespace ash 311 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/ime/tray_ime_chromeos.h ('k') | ash/common/system/tray/tray_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698