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

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

Issue 2491403003: chromeos: Move SystemTrayDelegate::RequestShutdown to WmShell (Closed)
Patch Set: Created 4 years, 1 month 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 | « no previous file | ash/aura/wm_shell_aura.cc » ('j') | ash/common/wm_shell.h » ('J')
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 void OnOverviewModeStarting() override; 75 void OnOverviewModeStarting() override;
76 void OnOverviewModeEnded() override; 76 void OnOverviewModeEnded() override;
77 SessionStateDelegate* GetSessionStateDelegate() override; 77 SessionStateDelegate* GetSessionStateDelegate() override;
78 void AddActivationObserver(WmActivationObserver* observer) override; 78 void AddActivationObserver(WmActivationObserver* observer) override;
79 void RemoveActivationObserver(WmActivationObserver* observer) override; 79 void RemoveActivationObserver(WmActivationObserver* observer) override;
80 void AddDisplayObserver(WmDisplayObserver* observer) override; 80 void AddDisplayObserver(WmDisplayObserver* observer) override;
81 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 81 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
82 void AddPointerWatcher(views::PointerWatcher* watcher, 82 void AddPointerWatcher(views::PointerWatcher* watcher,
83 views::PointerWatcherEventTypes events) override; 83 views::PointerWatcherEventTypes events) override;
84 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 84 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
85 void RequestShutdown() override;
85 bool IsTouchDown() override; 86 bool IsTouchDown() override;
86 #if defined(OS_CHROMEOS) 87 #if defined(OS_CHROMEOS)
87 void ToggleIgnoreExternalKeyboard() override; 88 void ToggleIgnoreExternalKeyboard() override;
88 void SetLaserPointerEnabled(bool enabled) override; 89 void SetLaserPointerEnabled(bool enabled) override;
89 #endif 90 #endif
90 91
91 private: 92 private:
92 // aura::client::ActivationChangeObserver: 93 // aura::client::ActivationChangeObserver:
93 void OnWindowActivated(ActivationReason reason, 94 void OnWindowActivated(ActivationReason reason,
94 aura::Window* gained_active, 95 aura::Window* gained_active,
(...skipping 13 matching lines...) Expand all
108 109
109 bool added_display_observer_ = false; 110 bool added_display_observer_ = false;
110 base::ObserverList<WmDisplayObserver> display_observers_; 111 base::ObserverList<WmDisplayObserver> display_observers_;
111 112
112 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 113 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
113 }; 114 };
114 115
115 } // namespace ash 116 } // namespace ash
116 117
117 #endif // ASH_AURA_WM_SHELL_AURA_H_ 118 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.cc » ('j') | ash/common/wm_shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698