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

Side by Side Diff: ash/common/wm_shell.h

Issue 2086503003: mash: Migrate tray IME view to wm common types, move to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movea11y
Patch Set: nit Created 4 years, 6 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/tray/wm_system_tray_notifier.cc ('k') | ash/mus/bridge/wm_shell_mus.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_WM_SHELL_H_ 5 #ifndef ASH_COMMON_WM_SHELL_H_
6 #define ASH_COMMON_WM_SHELL_H_ 6 #define ASH_COMMON_WM_SHELL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; 139 virtual void AddActivationObserver(WmActivationObserver* observer) = 0;
140 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; 140 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0;
141 141
142 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; 142 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0;
143 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; 143 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0;
144 144
145 virtual void AddShellObserver(ShellObserver* observer) = 0; 145 virtual void AddShellObserver(ShellObserver* observer) = 0;
146 virtual void RemoveShellObserver(ShellObserver* observer) = 0; 146 virtual void RemoveShellObserver(ShellObserver* observer) = 0;
147 147
148 #if defined(OS_CHROMEOS)
149 // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
150 virtual void ToggleIgnoreExternalKeyboard() = 0;
151 #endif
152
148 protected: 153 protected:
149 WmShell(); 154 WmShell();
150 virtual ~WmShell(); 155 virtual ~WmShell();
151 156
152 // If |delegate| is not null, sets and initializes the delegate. If |delegate| 157 // If |delegate| is not null, sets and initializes the delegate. If |delegate|
153 // is null, shuts down and destroys the delegate. 158 // is null, shuts down and destroys the delegate.
154 void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate); 159 void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
155 160
156 private: 161 private:
157 friend class Shell; 162 friend class Shell;
158 163
159 static WmShell* instance_; 164 static WmShell* instance_;
160 165
161 std::unique_ptr<FocusCycler> focus_cycler_; 166 std::unique_ptr<FocusCycler> focus_cycler_;
162 std::unique_ptr<WmSystemTrayNotifier> system_tray_notifier_; 167 std::unique_ptr<WmSystemTrayNotifier> system_tray_notifier_;
163 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 168 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
164 169
165 bool simulate_modal_window_open_for_testing_ = false; 170 bool simulate_modal_window_open_for_testing_ = false;
166 }; 171 };
167 172
168 } // namespace ash 173 } // namespace ash
169 174
170 #endif // ASH_COMMON_WM_SHELL_H_ 175 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/wm_system_tray_notifier.cc ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698