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

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

Issue 2150023002: Add ShellDelegate, MediaDelegate and KeyboardUI stubs to mus ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 4 years, 5 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/pointer_watcher_delegate.h ('k') | ash/common/wm_shell.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 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 #if defined(OS_CHROMEOS) 211 #if defined(OS_CHROMEOS)
212 LogoutConfirmationController* logout_confirmation_controller() { 212 LogoutConfirmationController* logout_confirmation_controller() {
213 return logout_confirmation_controller_.get(); 213 return logout_confirmation_controller_.get();
214 } 214 }
215 215
216 // TODO(jamescook): Remove this when VirtualKeyboardController has been moved. 216 // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
217 virtual void ToggleIgnoreExternalKeyboard() = 0; 217 virtual void ToggleIgnoreExternalKeyboard() = 0;
218 #endif 218 #endif
219 219
220 protected: 220 protected:
221 explicit WmShell(ShellDelegate* delegate); 221 explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate);
222 virtual ~WmShell(); 222 virtual ~WmShell();
223 223
224 base::ObserverList<ShellObserver>* shell_observers() { 224 base::ObserverList<ShellObserver>* shell_observers() {
225 return &shell_observers_; 225 return &shell_observers_;
226 } 226 }
227 227
228 void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui); 228 void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
229 229
230 // Helpers to set (and initialize) or destroy various delegates. 230 // Helpers to set (and initialize) or destroy various delegates.
231 // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported. 231 // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 bool simulate_modal_window_open_for_testing_ = false; 265 bool simulate_modal_window_open_for_testing_ = false;
266 266
267 #if defined(OS_CHROMEOS) 267 #if defined(OS_CHROMEOS)
268 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 268 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
269 #endif 269 #endif
270 }; 270 };
271 271
272 } // namespace ash 272 } // namespace ash
273 273
274 #endif // ASH_COMMON_WM_SHELL_H_ 274 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW
« no previous file with comments | « ash/common/pointer_watcher_delegate.h ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698