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

Side by Side Diff: ash/shell.h

Issue 2260613002: Adds ImmersiveContext and ImmersiveHandlerFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback 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/shared/immersive_context.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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 class VisibilityController; 72 class VisibilityController;
73 class WindowModalityController; 73 class WindowModalityController;
74 } 74 }
75 75
76 namespace ash { 76 namespace ash {
77 77
78 class AcceleratorControllerDelegateAura; 78 class AcceleratorControllerDelegateAura;
79 class AshNativeCursorManager; 79 class AshNativeCursorManager;
80 class AutoclickController; 80 class AutoclickController;
81 class BluetoothNotificationController; 81 class BluetoothNotificationController;
82 class CaptureController;
83 class DesktopBackgroundController; 82 class DesktopBackgroundController;
84 class DisplayChangeObserver; 83 class DisplayChangeObserver;
85 class DisplayColorManager; 84 class DisplayColorManager;
86 class DisplayConfigurationController; 85 class DisplayConfigurationController;
87 class WindowTreeHostManager; 86 class WindowTreeHostManager;
88 class DisplayErrorObserver; 87 class DisplayErrorObserver;
89 class DisplayManager; 88 class DisplayManager;
90 class DragDropController; 89 class DragDropController;
91 class EventClientImpl; 90 class EventClientImpl;
92 class EventRewriterEventFilter; 91 class EventRewriterEventFilter;
93 class EventTransformationHandler; 92 class EventTransformationHandler;
94 class FirstRunHelper; 93 class FirstRunHelper;
95 class GPUSupport; 94 class GPUSupport;
96 class HighContrastController; 95 class HighContrastController;
96 class ImmersiveContextAsh;
97 class ImmersiveHandlerFactoryAsh;
97 class LinkHandlerModelFactory; 98 class LinkHandlerModelFactory;
98 class LocaleNotificationController; 99 class LocaleNotificationController;
99 class LockStateController; 100 class LockStateController;
100 enum class LoginStatus; 101 enum class LoginStatus;
101 class MagnificationController; 102 class MagnificationController;
102 class MouseCursorEventFilter; 103 class MouseCursorEventFilter;
103 class OverlayEventFilter; 104 class OverlayEventFilter;
104 class PartialMagnificationController; 105 class PartialMagnificationController;
105 class PointerWatcherDelegate; 106 class PointerWatcherDelegate;
106 class PowerButtonController; 107 class PowerButtonController;
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 std::unique_ptr<::wm::CursorManager> cursor_manager_; 594 std::unique_ptr<::wm::CursorManager> cursor_manager_;
594 595
595 // For testing only: simulate that a modal window is open 596 // For testing only: simulate that a modal window is open
596 bool simulate_modal_window_open_for_testing_; 597 bool simulate_modal_window_open_for_testing_;
597 598
598 bool is_touch_hud_projection_enabled_; 599 bool is_touch_hud_projection_enabled_;
599 600
600 // Injected content::GPUDataManager support. 601 // Injected content::GPUDataManager support.
601 std::unique_ptr<GPUSupport> gpu_support_; 602 std::unique_ptr<GPUSupport> gpu_support_;
602 603
604 std::unique_ptr<ImmersiveContextAsh> immersive_context_;
605 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
606
603 base::SequencedWorkerPool* blocking_pool_; 607 base::SequencedWorkerPool* blocking_pool_;
604 608
605 bool in_mus_ = false; 609 bool in_mus_ = false;
606 610
607 DISALLOW_COPY_AND_ASSIGN(Shell); 611 DISALLOW_COPY_AND_ASSIGN(Shell);
608 }; 612 };
609 613
610 } // namespace ash 614 } // namespace ash
611 615
612 #endif // ASH_SHELL_H_ 616 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shared/immersive_context.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698