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

Side by Side Diff: ash/shell.h

Issue 2211463002: mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add TODO comments with bug for WmWindowMus ShelfItemDetails support. 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
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 class ResolutionNotificationController; 110 class ResolutionNotificationController;
111 class RootWindowController; 111 class RootWindowController;
112 class ScopedOverviewAnimationSettingsFactoryAura; 112 class ScopedOverviewAnimationSettingsFactoryAura;
113 class ScreenAsh; 113 class ScreenAsh;
114 class ScreenOrientationController; 114 class ScreenOrientationController;
115 class ScreenshotController; 115 class ScreenshotController;
116 class ScreenPinningController; 116 class ScreenPinningController;
117 class ScreenPositionController; 117 class ScreenPositionController;
118 class SessionStateDelegate; 118 class SessionStateDelegate;
119 class Shelf; 119 class Shelf;
120 class ShelfWindowWatcher;
121 class ShellDelegate; 120 class ShellDelegate;
122 struct ShellInitParams; 121 struct ShellInitParams;
123 class SlowAnimationEventFilter; 122 class SlowAnimationEventFilter;
124 class StatusAreaWidget; 123 class StatusAreaWidget;
125 class StickyKeysController; 124 class StickyKeysController;
126 class SystemGestureEventFilter; 125 class SystemGestureEventFilter;
127 class SystemModalContainerEventFilter; 126 class SystemModalContainerEventFilter;
128 class SystemTray; 127 class SystemTray;
129 class ToplevelWindowEventHandler; 128 class ToplevelWindowEventHandler;
130 class TouchTransformerController; 129 class TouchTransformerController;
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 515 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
517 516
518 std::vector<WindowAndBoundsPair> to_restore_; 517 std::vector<WindowAndBoundsPair> to_restore_;
519 518
520 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 519 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
521 std::unique_ptr<AcceleratorControllerDelegateAura> 520 std::unique_ptr<AcceleratorControllerDelegateAura>
522 accelerator_controller_delegate_; 521 accelerator_controller_delegate_;
523 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 522 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
524 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 523 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
525 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_; 524 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
526 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
527 std::unique_ptr<WindowPositioner> window_positioner_; 525 std::unique_ptr<WindowPositioner> window_positioner_;
528 526
529 std::unique_ptr<DragDropController> drag_drop_controller_; 527 std::unique_ptr<DragDropController> drag_drop_controller_;
530 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 528 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
531 std::unique_ptr<::wm::ShadowController> shadow_controller_; 529 std::unique_ptr<::wm::ShadowController> shadow_controller_;
532 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 530 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
533 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 531 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
534 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 532 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
535 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; 533 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
536 LinkHandlerModelFactory* link_handler_model_factory_; 534 LinkHandlerModelFactory* link_handler_model_factory_;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 base::SequencedWorkerPool* blocking_pool_; 622 base::SequencedWorkerPool* blocking_pool_;
625 623
626 bool in_mus_ = false; 624 bool in_mus_ = false;
627 625
628 DISALLOW_COPY_AND_ASSIGN(Shell); 626 DISALLOW_COPY_AND_ASSIGN(Shell);
629 }; 627 };
630 628
631 } // namespace ash 629 } // namespace ash
632 630
633 #endif // ASH_SHELL_H_ 631 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698