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

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

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 4 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 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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 262
263 virtual std::unique_ptr<wm::MaximizeModeEventHandler> 263 virtual std::unique_ptr<wm::MaximizeModeEventHandler>
264 CreateMaximizeModeEventHandler() = 0; 264 CreateMaximizeModeEventHandler() = 0;
265 265
266 virtual std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 266 virtual std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
267 CreateScopedDisableInternalMouseAndKeyboard() = 0; 267 CreateScopedDisableInternalMouseAndKeyboard() = 0;
268 268
269 virtual std::unique_ptr<WmImmersiveFullscreenController> 269 virtual std::unique_ptr<WmImmersiveFullscreenController>
270 CreateImmersiveFullscreenController() = 0; 270 CreateImmersiveFullscreenController() = 0;
271 271
272 void CreateShelfDelegate();
273
272 // Called after maximize mode has started, windows might still animate though. 274 // Called after maximize mode has started, windows might still animate though.
273 void OnMaximizeModeStarted(); 275 void OnMaximizeModeStarted();
274 276
275 // Called after maximize mode has ended, windows might still be returning to 277 // Called after maximize mode has ended, windows might still be returning to
276 // their original position. 278 // their original position.
277 void OnMaximizeModeEnded(); 279 void OnMaximizeModeEnded();
278 280
279 // Called when the overview mode is about to be started (before the windows 281 // Called when the overview mode is about to be started (before the windows
280 // get re-arranged). 282 // get re-arranged).
281 virtual void OnOverviewModeStarting() = 0; 283 virtual void OnOverviewModeStarting() = 0;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 return &shell_observers_; 351 return &shell_observers_;
350 } 352 }
351 353
352 void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui); 354 void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
353 355
354 // Helpers to set (and initialize) or destroy various delegates. 356 // Helpers to set (and initialize) or destroy various delegates.
355 // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported. 357 // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported.
356 void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate); 358 void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
357 void DeleteSystemTrayDelegate(); 359 void DeleteSystemTrayDelegate();
358 360
359 void CreateShelfDelegate();
360
361 void DeleteWindowCycleController(); 361 void DeleteWindowCycleController();
362 362
363 void DeleteWindowSelectorController(); 363 void DeleteWindowSelectorController();
364 364
365 void CreateMaximizeModeController(); 365 void CreateMaximizeModeController();
366 void DeleteMaximizeModeController(); 366 void DeleteMaximizeModeController();
367 367
368 void CreateMruWindowTracker(); 368 void CreateMruWindowTracker();
369 void DeleteMruWindowTracker(); 369 void DeleteMruWindowTracker();
370 370
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 bool simulate_modal_window_open_for_testing_ = false; 413 bool simulate_modal_window_open_for_testing_ = false;
414 414
415 #if defined(OS_CHROMEOS) 415 #if defined(OS_CHROMEOS)
416 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; 416 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
417 #endif 417 #endif
418 }; 418 };
419 419
420 } // namespace ash 420 } // namespace ash
421 421
422 #endif // ASH_COMMON_WM_SHELL_H_ 422 #endif // ASH_COMMON_WM_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698