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

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

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 void RequestShutdown() override;
86 bool IsTouchDown() override; 86 bool IsTouchDown() override;
87 #if defined(OS_CHROMEOS)
88 void ToggleIgnoreExternalKeyboard() override; 87 void ToggleIgnoreExternalKeyboard() override;
89 void SetLaserPointerEnabled(bool enabled) override; 88 void SetLaserPointerEnabled(bool enabled) override;
90 #endif
91 89
92 private: 90 private:
93 // aura::client::ActivationChangeObserver: 91 // aura::client::ActivationChangeObserver:
94 void OnWindowActivated(ActivationReason reason, 92 void OnWindowActivated(ActivationReason reason,
95 aura::Window* gained_active, 93 aura::Window* gained_active,
96 aura::Window* lost_active) override; 94 aura::Window* lost_active) override;
97 void OnAttemptToReactivateWindow(aura::Window* request_active, 95 void OnAttemptToReactivateWindow(aura::Window* request_active,
98 aura::Window* actual_active) override; 96 aura::Window* actual_active) override;
99 97
100 // SessionStateObserver: 98 // SessionStateObserver:
(...skipping 11 matching lines...) Expand all
112 110
113 bool added_display_observer_ = false; 111 bool added_display_observer_ = false;
114 base::ObserverList<WmDisplayObserver> display_observers_; 112 base::ObserverList<WmDisplayObserver> display_observers_;
115 113
116 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 114 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
117 }; 115 };
118 116
119 } // namespace ash 117 } // namespace ash
120 118
121 #endif // ASH_AURA_WM_SHELL_AURA_H_ 119 #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