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

Side by Side Diff: ash/aura/wm_shell_aura.h

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_shell_aura.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 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_AURA_WM_SHELL_AURA_H_ 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_
6 #define ASH_AURA_WM_SHELL_AURA_H_ 6 #define ASH_AURA_WM_SHELL_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 override; 60 override;
61 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler() 61 std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
62 override; 62 override;
63 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler( 63 std::unique_ptr<WorkspaceEventHandler> CreateWorkspaceEventHandler(
64 WmWindow* workspace_window) override; 64 WmWindow* workspace_window) override;
65 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 65 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
66 CreateScopedDisableInternalMouseAndKeyboard() override; 66 CreateScopedDisableInternalMouseAndKeyboard() override;
67 std::unique_ptr<ImmersiveFullscreenController> 67 std::unique_ptr<ImmersiveFullscreenController>
68 CreateImmersiveFullscreenController() override; 68 CreateImmersiveFullscreenController() override;
69 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override; 69 std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() override;
70 void OnOverviewModeStarting() override;
71 void OnOverviewModeEnded() override;
72 SessionStateDelegate* GetSessionStateDelegate() override; 70 SessionStateDelegate* GetSessionStateDelegate() override;
73 void AddDisplayObserver(WmDisplayObserver* observer) override; 71 void AddDisplayObserver(WmDisplayObserver* observer) override;
74 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 72 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
75 void AddPointerWatcher(views::PointerWatcher* watcher, 73 void AddPointerWatcher(views::PointerWatcher* watcher,
76 views::PointerWatcherEventTypes events) override; 74 views::PointerWatcherEventTypes events) override;
77 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 75 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
78 bool IsTouchDown() override; 76 bool IsTouchDown() override;
79 void ToggleIgnoreExternalKeyboard() override; 77 void ToggleIgnoreExternalKeyboard() override;
80 void SetLaserPointerEnabled(bool enabled) override; 78 void SetLaserPointerEnabled(bool enabled) override;
81 void SetPartialMagnifierEnabled(bool enabled) override; 79 void SetPartialMagnifierEnabled(bool enabled) override;
(...skipping 13 matching lines...) Expand all
95 93
96 bool added_display_observer_ = false; 94 bool added_display_observer_ = false;
97 base::ObserverList<WmDisplayObserver> display_observers_; 95 base::ObserverList<WmDisplayObserver> display_observers_;
98 96
99 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 97 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
100 }; 98 };
101 99
102 } // namespace ash 100 } // namespace ash
103 101
104 #endif // ASH_AURA_WM_SHELL_AURA_H_ 102 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698