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

Side by Side Diff: ash/shell.h

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 3 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/root_window_controller.cc ('k') | ash/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 (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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 class SlowAnimationEventFilter; 120 class SlowAnimationEventFilter;
121 class StatusAreaWidget; 121 class StatusAreaWidget;
122 class StickyKeysController; 122 class StickyKeysController;
123 class StylusMetricsRecorder; 123 class StylusMetricsRecorder;
124 class SystemGestureEventFilter; 124 class SystemGestureEventFilter;
125 class SystemModalContainerEventFilter; 125 class SystemModalContainerEventFilter;
126 class SystemTray; 126 class SystemTray;
127 class ToplevelWindowEventHandler; 127 class ToplevelWindowEventHandler;
128 class TouchTransformerController; 128 class TouchTransformerController;
129 class TouchObserverHUD; 129 class TouchObserverHUD;
130 class UserWallpaperDelegate;
131 class VirtualKeyboardController; 130 class VirtualKeyboardController;
132 class VideoActivityNotifier; 131 class VideoActivityNotifier;
133 class VideoDetector; 132 class VideoDetector;
134 class WebNotificationTray; 133 class WebNotificationTray;
135 class WindowPositioner; 134 class WindowPositioner;
136 class WmShellAura; 135 class WmShellAura;
137 class WmWindow; 136 class WmWindow;
138 137
139 namespace shell { 138 namespace shell {
140 class WindowWatcher; 139 class WindowWatcher;
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 return screenshot_controller_.get(); 307 return screenshot_controller_.get();
309 } 308 }
310 MouseCursorEventFilter* mouse_cursor_filter() { 309 MouseCursorEventFilter* mouse_cursor_filter() {
311 return mouse_cursor_filter_.get(); 310 return mouse_cursor_filter_.get();
312 } 311 }
313 EventTransformationHandler* event_transformation_handler() { 312 EventTransformationHandler* event_transformation_handler() {
314 return event_transformation_handler_.get(); 313 return event_transformation_handler_.get();
315 } 314 }
316 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } 315 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
317 316
318 UserWallpaperDelegate* user_wallpaper_delegate() {
319 return user_wallpaper_delegate_.get();
320 }
321
322 SessionStateDelegate* session_state_delegate() { 317 SessionStateDelegate* session_state_delegate() {
323 return session_state_delegate_.get(); 318 return session_state_delegate_.get();
324 } 319 }
325 320
326 HighContrastController* high_contrast_controller() { 321 HighContrastController* high_contrast_controller() {
327 return high_contrast_controller_.get(); 322 return high_contrast_controller_.get();
328 } 323 }
329 324
330 MagnificationController* magnification_controller() { 325 MagnificationController* magnification_controller() {
331 return magnification_controller_.get(); 326 return magnification_controller_.get();
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 std::unique_ptr<WmShellAura> wm_shell_; 484 std::unique_ptr<WmShellAura> wm_shell_;
490 485
491 // The CompoundEventFilter owned by aura::Env object. 486 // The CompoundEventFilter owned by aura::Env object.
492 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 487 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
493 488
494 std::vector<WindowAndBoundsPair> to_restore_; 489 std::vector<WindowAndBoundsPair> to_restore_;
495 490
496 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 491 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
497 std::unique_ptr<AcceleratorControllerDelegateAura> 492 std::unique_ptr<AcceleratorControllerDelegateAura>
498 accelerator_controller_delegate_; 493 accelerator_controller_delegate_;
499 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
500 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 494 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
501 std::unique_ptr<WindowPositioner> window_positioner_; 495 std::unique_ptr<WindowPositioner> window_positioner_;
502 496
503 std::unique_ptr<DragDropController> drag_drop_controller_; 497 std::unique_ptr<DragDropController> drag_drop_controller_;
504 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 498 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
505 std::unique_ptr<::wm::ShadowController> shadow_controller_; 499 std::unique_ptr<::wm::ShadowController> shadow_controller_;
506 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 500 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
507 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 501 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
508 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 502 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
509 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; 503 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 base::SequencedWorkerPool* blocking_pool_; 595 base::SequencedWorkerPool* blocking_pool_;
602 596
603 bool in_mus_ = false; 597 bool in_mus_ = false;
604 598
605 DISALLOW_COPY_AND_ASSIGN(Shell); 599 DISALLOW_COPY_AND_ASSIGN(Shell);
606 }; 600 };
607 601
608 } // namespace ash 602 } // namespace ash
609 603
610 #endif // ASH_SHELL_H_ 604 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698