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

Side by Side Diff: ash/shell.h

Issue 2271223003: Revert "Adding the following stylus metrics:" (Closed)
Patch Set: 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/ash.gyp ('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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 class ScreenshotController; 113 class ScreenshotController;
114 class ScreenPinningController; 114 class ScreenPinningController;
115 class ScreenPositionController; 115 class ScreenPositionController;
116 class SessionStateDelegate; 116 class SessionStateDelegate;
117 class Shelf; 117 class Shelf;
118 class ShellDelegate; 118 class ShellDelegate;
119 struct ShellInitParams; 119 struct ShellInitParams;
120 class SlowAnimationEventFilter; 120 class SlowAnimationEventFilter;
121 class StatusAreaWidget; 121 class StatusAreaWidget;
122 class StickyKeysController; 122 class StickyKeysController;
123 class StylusMetricsRecorder;
124 class SystemGestureEventFilter; 123 class SystemGestureEventFilter;
125 class SystemModalContainerEventFilter; 124 class SystemModalContainerEventFilter;
126 class SystemTray; 125 class SystemTray;
127 class ToplevelWindowEventHandler; 126 class ToplevelWindowEventHandler;
128 class TouchTransformerController; 127 class TouchTransformerController;
129 class TouchObserverHUD; 128 class TouchObserverHUD;
130 class UserWallpaperDelegate; 129 class UserWallpaperDelegate;
131 class VirtualKeyboardController; 130 class VirtualKeyboardController;
132 class VideoActivityNotifier; 131 class VideoActivityNotifier;
133 class VideoDetector; 132 class VideoDetector;
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 // Listens for output changes and updates the display manager. 569 // Listens for output changes and updates the display manager.
571 std::unique_ptr<DisplayChangeObserver> display_change_observer_; 570 std::unique_ptr<DisplayChangeObserver> display_change_observer_;
572 571
573 // Implements content::ScreenOrientationController for ChromeOS 572 // Implements content::ScreenOrientationController for ChromeOS
574 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 573 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
575 574
576 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 575 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
577 576
578 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 577 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
579 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 578 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
580 std::unique_ptr<StylusMetricsRecorder> stylus_metrics_recorder_;
581 #endif // defined(OS_CHROMEOS) 579 #endif // defined(OS_CHROMEOS)
582 580
583 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 581 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
584 // pointer to vend to test code. 582 // pointer to vend to test code.
585 AshNativeCursorManager* native_cursor_manager_; 583 AshNativeCursorManager* native_cursor_manager_;
586 584
587 // Cursor may be hidden on certain key events in ChromeOS, whereas we never 585 // Cursor may be hidden on certain key events in ChromeOS, whereas we never
588 // hide the cursor on Windows. 586 // hide the cursor on Windows.
589 std::unique_ptr<::wm::CursorManager> cursor_manager_; 587 std::unique_ptr<::wm::CursorManager> cursor_manager_;
590 588
(...skipping 10 matching lines...) Expand all
601 base::SequencedWorkerPool* blocking_pool_; 599 base::SequencedWorkerPool* blocking_pool_;
602 600
603 bool in_mus_ = false; 601 bool in_mus_ = false;
604 602
605 DISALLOW_COPY_AND_ASSIGN(Shell); 603 DISALLOW_COPY_AND_ASSIGN(Shell);
606 }; 604 };
607 605
608 } // namespace ash 606 } // namespace ash
609 607
610 #endif // ASH_SHELL_H_ 608 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698