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

Side by Side Diff: ash/system/ime/tray_ime_chromeos.h

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: merge 2 trunk Created 4 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ 5 #ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
6 #define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ 6 #define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h" 10 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 base::string16 GetDefaultViewLabel(bool show_ime_label); 58 base::string16 GetDefaultViewLabel(bool show_ime_label);
59 59
60 // Overridden from SystemTrayItem. 60 // Overridden from SystemTrayItem.
61 views::View* CreateTrayView(user::LoginStatus status) override; 61 views::View* CreateTrayView(user::LoginStatus status) override;
62 views::View* CreateDefaultView(user::LoginStatus status) override; 62 views::View* CreateDefaultView(user::LoginStatus status) override;
63 views::View* CreateDetailedView(user::LoginStatus status) override; 63 views::View* CreateDetailedView(user::LoginStatus status) override;
64 void DestroyTrayView() override; 64 void DestroyTrayView() override;
65 void DestroyDefaultView() override; 65 void DestroyDefaultView() override;
66 void DestroyDetailedView() override; 66 void DestroyDetailedView() override;
67 void UpdateAfterLoginStatusChange(user::LoginStatus status) override; 67 void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
68 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override; 68 void UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) override;
69 69
70 // Overridden from IMEObserver. 70 // Overridden from IMEObserver.
71 void OnIMERefresh() override; 71 void OnIMERefresh() override;
72 void OnIMEMenuActivationChanged(bool is_active) override; 72 void OnIMEMenuActivationChanged(bool is_active) override;
73 73
74 // Whether the default view should be shown. 74 // Whether the default view should be shown.
75 bool ShouldDefaultViewBeVisible(); 75 bool ShouldDefaultViewBeVisible();
76 76
77 TrayItemView* tray_label_; 77 TrayItemView* tray_label_;
78 tray::IMEDefaultView* default_; 78 tray::IMEDefaultView* default_;
79 tray::IMEDetailedView* detailed_; 79 tray::IMEDetailedView* detailed_;
80 // Whether the virtual keyboard is suppressed. 80 // Whether the virtual keyboard is suppressed.
81 bool keyboard_suppressed_; 81 bool keyboard_suppressed_;
82 // Cached IME info. 82 // Cached IME info.
83 IMEInfoList ime_list_; 83 IMEInfoList ime_list_;
84 IMEInfo current_ime_; 84 IMEInfo current_ime_;
85 IMEPropertyInfoList property_list_; 85 IMEPropertyInfoList property_list_;
86 // Whether the IME label and tray items should be visible. 86 // Whether the IME label and tray items should be visible.
87 bool is_visible_; 87 bool is_visible_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(TrayIME); 89 DISALLOW_COPY_AND_ASSIGN(TrayIME);
90 }; 90 };
91 91
92 } // namespace ash 92 } // namespace ash
93 93
94 #endif // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_ 94 #endif // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698