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

Side by Side Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve conflicts Created 4 years, 5 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/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.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_MUS_BRIDGE_WM_SHELL_MUS_H_ 5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 override; 75 override;
76 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> 76 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
77 CreateScopedDisableInternalMouseAndKeyboard() override; 77 CreateScopedDisableInternalMouseAndKeyboard() override;
78 void OnOverviewModeStarting() override; 78 void OnOverviewModeStarting() override;
79 void OnOverviewModeEnded() override; 79 void OnOverviewModeEnded() override;
80 SessionStateDelegate* GetSessionStateDelegate() override; 80 SessionStateDelegate* GetSessionStateDelegate() override;
81 void AddActivationObserver(WmActivationObserver* observer) override; 81 void AddActivationObserver(WmActivationObserver* observer) override;
82 void RemoveActivationObserver(WmActivationObserver* observer) override; 82 void RemoveActivationObserver(WmActivationObserver* observer) override;
83 void AddDisplayObserver(WmDisplayObserver* observer) override; 83 void AddDisplayObserver(WmDisplayObserver* observer) override;
84 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 84 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
85 void AddPointerDownWatcher(views::PointerDownWatcher* watcher) override; 85 void AddPointerWatcher(views::PointerWatcher* watcher) override;
86 void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) override; 86 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
87 #if defined(OS_CHROMEOS) 87 #if defined(OS_CHROMEOS)
88 void ToggleIgnoreExternalKeyboard() override; 88 void ToggleIgnoreExternalKeyboard() override;
89 #endif 89 #endif
90 90
91 private: 91 private:
92 // Returns true if |window| is a window that can have active children. 92 // Returns true if |window| is a window that can have active children.
93 static bool IsActivationParent(::ui::Window* window); 93 static bool IsActivationParent(::ui::Window* window);
94 94
95 void RemoveClientObserver(); 95 void RemoveClientObserver();
96 96
(...skipping 12 matching lines...) Expand all
109 109
110 base::ObserverList<WmActivationObserver> activation_observers_; 110 base::ObserverList<WmActivationObserver> activation_observers_;
111 111
112 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 112 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
113 }; 113 };
114 114
115 } // namespace mus 115 } // namespace mus
116 } // namespace ash 116 } // namespace ash
117 117
118 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 118 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698