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

Side by Side Diff: ash/shell.h

Issue 2012343002: Converts overview to use common ash types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback 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/metrics/user_metrics_recorder.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 NewWindowDelegate; 120 class NewWindowDelegate;
121 class OverlayEventFilter; 121 class OverlayEventFilter;
122 class PartialMagnificationController; 122 class PartialMagnificationController;
123 class PointerWatcherDelegate; 123 class PointerWatcherDelegate;
124 class PowerButtonController; 124 class PowerButtonController;
125 class PowerEventObserver; 125 class PowerEventObserver;
126 class ProjectingObserver; 126 class ProjectingObserver;
127 class ResizeShadowController; 127 class ResizeShadowController;
128 class ResolutionNotificationController; 128 class ResolutionNotificationController;
129 class RootWindowController; 129 class RootWindowController;
130 class ScopedOverviewAnimationSettingsFactoryAura;
130 class ScopedTargetRootWindow; 131 class ScopedTargetRootWindow;
131 class ScreenAsh; 132 class ScreenAsh;
132 class ScreenOrientationController; 133 class ScreenOrientationController;
133 class ScreenshotController; 134 class ScreenshotController;
134 class ScreenPositionController; 135 class ScreenPositionController;
135 class SessionStateDelegate; 136 class SessionStateDelegate;
136 class Shelf; 137 class Shelf;
137 class ShelfDelegate; 138 class ShelfDelegate;
138 class ShelfItemDelegateManager; 139 class ShelfItemDelegateManager;
139 class ShelfModel; 140 class ShelfModel;
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 aura::client::ActivationChangeObserver::ActivationReason reason, 661 aura::client::ActivationChangeObserver::ActivationReason reason,
661 aura::Window* gained_active, 662 aura::Window* gained_active,
662 aura::Window* lost_active) override; 663 aura::Window* lost_active) override;
663 664
664 static Shell* instance_; 665 static Shell* instance_;
665 666
666 // If set before the Shell is initialized, the mouse cursor will be hidden 667 // If set before the Shell is initialized, the mouse cursor will be hidden
667 // when the screen is initially created. 668 // when the screen is initially created.
668 static bool initially_hide_cursor_; 669 static bool initially_hide_cursor_;
669 670
671 std::unique_ptr<ScopedOverviewAnimationSettingsFactoryAura>
672 scoped_overview_animation_settings_factory_;
670 std::unique_ptr<wm::WmGlobalsAura> wm_globals_; 673 std::unique_ptr<wm::WmGlobalsAura> wm_globals_;
671 674
672 // When no explicit target display/RootWindow is given, new windows are 675 // When no explicit target display/RootWindow is given, new windows are
673 // created on |scoped_target_root_window_| , unless NULL in 676 // created on |scoped_target_root_window_| , unless NULL in
674 // which case they are created on |target_root_window_|. 677 // which case they are created on |target_root_window_|.
675 // |target_root_window_| never becomes NULL during the session. 678 // |target_root_window_| never becomes NULL during the session.
676 aura::Window* target_root_window_; 679 aura::Window* target_root_window_;
677 aura::Window* scoped_target_root_window_; 680 aura::Window* scoped_target_root_window_;
678 681
679 // The CompoundEventFilter owned by aura::Env object. 682 // The CompoundEventFilter owned by aura::Env object.
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 bool in_mus_ = false; 817 bool in_mus_ = false;
815 818
816 std::unique_ptr<KeyboardUI> keyboard_ui_; 819 std::unique_ptr<KeyboardUI> keyboard_ui_;
817 820
818 DISALLOW_COPY_AND_ASSIGN(Shell); 821 DISALLOW_COPY_AND_ASSIGN(Shell);
819 }; 822 };
820 823
821 } // namespace ash 824 } // namespace ash
822 825
823 #endif // ASH_SHELL_H_ 826 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698