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

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

Issue 2271393002: Wires up drags to pointer watcher adapter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fixed patch set 8 errors. Created 4 years, 3 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/aura/pointer_watcher_adapter_unittest.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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 std::unique_ptr<ImmersiveFullscreenController> 72 std::unique_ptr<ImmersiveFullscreenController>
73 CreateImmersiveFullscreenController() override; 73 CreateImmersiveFullscreenController() override;
74 void OnOverviewModeStarting() override; 74 void OnOverviewModeStarting() override;
75 void OnOverviewModeEnded() override; 75 void OnOverviewModeEnded() override;
76 SessionStateDelegate* GetSessionStateDelegate() override; 76 SessionStateDelegate* GetSessionStateDelegate() override;
77 void AddActivationObserver(WmActivationObserver* observer) override; 77 void AddActivationObserver(WmActivationObserver* observer) override;
78 void RemoveActivationObserver(WmActivationObserver* observer) override; 78 void RemoveActivationObserver(WmActivationObserver* observer) override;
79 void AddDisplayObserver(WmDisplayObserver* observer) override; 79 void AddDisplayObserver(WmDisplayObserver* observer) override;
80 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 80 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
81 void AddPointerWatcher(views::PointerWatcher* watcher, 81 void AddPointerWatcher(views::PointerWatcher* watcher,
82 bool wants_moves) override; 82 views::PointerWatcherEventTypes events) override;
83 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 83 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
84 bool IsTouchDown() override; 84 bool IsTouchDown() override;
85 #if defined(OS_CHROMEOS) 85 #if defined(OS_CHROMEOS)
86 void ToggleIgnoreExternalKeyboard() override; 86 void ToggleIgnoreExternalKeyboard() override;
87 #endif 87 #endif
88 88
89 private: 89 private:
90 // aura::client::ActivationChangeObserver: 90 // aura::client::ActivationChangeObserver:
91 void OnWindowActivated(ActivationReason reason, 91 void OnWindowActivated(ActivationReason reason,
92 aura::Window* gained_active, 92 aura::Window* gained_active,
(...skipping 13 matching lines...) Expand all
106 106
107 bool added_display_observer_ = false; 107 bool added_display_observer_ = false;
108 base::ObserverList<WmDisplayObserver> display_observers_; 108 base::ObserverList<WmDisplayObserver> display_observers_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 110 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
111 }; 111 };
112 112
113 } // namespace ash 113 } // namespace ash
114 114
115 #endif // ASH_AURA_WM_SHELL_AURA_H_ 115 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/aura/pointer_watcher_adapter_unittest.cc ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698