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

Side by Side Diff: ash/shell.h

Issue 2235363003: Wires up WmShellMus::Add/RemovePointerWatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pointer_watcher_capture
Patch Set: merge to tot again Created 4 years, 4 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/pointer_watcher_delegate_aura.cc ('k') | ash/shell.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already 249 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
250 // exists. 250 // exists.
251 void CreateKeyboard(); 251 void CreateKeyboard();
252 252
253 // Deactivates the virtual keyboard. 253 // Deactivates the virtual keyboard.
254 void DeactivateKeyboard(); 254 void DeactivateKeyboard();
255 255
256 // Show shelf view if it was created hidden (before session has started). 256 // Show shelf view if it was created hidden (before session has started).
257 void ShowShelf(); 257 void ShowShelf();
258 258
259 void AddPointerWatcher(views::PointerWatcher* watcher); 259 void AddPointerWatcher(views::PointerWatcher* watcher, bool wants_moves);
260 void RemovePointerWatcher(views::PointerWatcher* watcher); 260 void RemovePointerWatcher(views::PointerWatcher* watcher);
261 261
262 #if defined(OS_CHROMEOS) 262 #if defined(OS_CHROMEOS)
263 // Test if MaximizeModeWindowManager is not enabled, and if 263 // Test if MaximizeModeWindowManager is not enabled, and if
264 // MaximizeModeController is not currently setting a display rotation. Or if 264 // MaximizeModeController is not currently setting a display rotation. Or if
265 // the |resolution_notification_controller_| is not showing its confirmation 265 // the |resolution_notification_controller_| is not showing its confirmation
266 // dialog. If true then changes to display settings can be saved. 266 // dialog. If true then changes to display settings can be saved.
267 bool ShouldSaveDisplaySettings(); 267 bool ShouldSaveDisplaySettings();
268 #endif 268 #endif
269 269
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 base::SequencedWorkerPool* blocking_pool_; 603 base::SequencedWorkerPool* blocking_pool_;
604 604
605 bool in_mus_ = false; 605 bool in_mus_ = false;
606 606
607 DISALLOW_COPY_AND_ASSIGN(Shell); 607 DISALLOW_COPY_AND_ASSIGN(Shell);
608 }; 608 };
609 609
610 } // namespace ash 610 } // namespace ash
611 611
612 #endif // ASH_SHELL_H_ 612 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/pointer_watcher_delegate_aura.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698