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

Side by Side Diff: ash/shell.h

Issue 2217713002: Remove the system menu display settings row (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 struct ShellInitParams; 121 struct ShellInitParams;
122 class SlowAnimationEventFilter; 122 class SlowAnimationEventFilter;
123 class StatusAreaWidget; 123 class StatusAreaWidget;
124 class StickyKeysController; 124 class StickyKeysController;
125 class SystemGestureEventFilter; 125 class SystemGestureEventFilter;
126 class SystemModalContainerEventFilter; 126 class SystemModalContainerEventFilter;
127 class SystemTray; 127 class SystemTray;
128 class ToplevelWindowEventHandler; 128 class ToplevelWindowEventHandler;
129 class TouchTransformerController; 129 class TouchTransformerController;
130 class TouchObserverHUD; 130 class TouchObserverHUD;
131 class ScreenLayoutObserver;
131 class UserWallpaperDelegate; 132 class UserWallpaperDelegate;
132 class VirtualKeyboardController; 133 class VirtualKeyboardController;
133 class VideoActivityNotifier; 134 class VideoActivityNotifier;
134 class VideoDetector; 135 class VideoDetector;
135 class WebNotificationTray; 136 class WebNotificationTray;
136 class WindowPositioner; 137 class WindowPositioner;
137 class WmShellAura; 138 class WmShellAura;
138 class WmWindow; 139 class WmWindow;
139 140
140 namespace shell { 141 namespace shell {
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; 590 std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
590 std::unique_ptr<DisplayColorManager> display_color_manager_; 591 std::unique_ptr<DisplayColorManager> display_color_manager_;
591 std::unique_ptr<DisplayErrorObserver> display_error_observer_; 592 std::unique_ptr<DisplayErrorObserver> display_error_observer_;
592 std::unique_ptr<ProjectingObserver> projecting_observer_; 593 std::unique_ptr<ProjectingObserver> projecting_observer_;
593 594
594 // Listens for output changes and updates the display manager. 595 // Listens for output changes and updates the display manager.
595 std::unique_ptr<DisplayChangeObserver> display_change_observer_; 596 std::unique_ptr<DisplayChangeObserver> display_change_observer_;
596 597
597 // Implements content::ScreenOrientationController for ChromeOS 598 // Implements content::ScreenOrientationController for ChromeOS
598 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 599 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
600 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_;
599 601
600 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 602 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
601 603
602 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 604 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
603 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 605 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
604 #endif // defined(OS_CHROMEOS) 606 #endif // defined(OS_CHROMEOS)
605 607
606 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 608 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
607 // pointer to vend to test code. 609 // pointer to vend to test code.
608 AshNativeCursorManager* native_cursor_manager_; 610 AshNativeCursorManager* native_cursor_manager_;
(...skipping 13 matching lines...) Expand all
622 base::SequencedWorkerPool* blocking_pool_; 624 base::SequencedWorkerPool* blocking_pool_;
623 625
624 bool in_mus_ = false; 626 bool in_mus_ = false;
625 627
626 DISALLOW_COPY_AND_ASSIGN(Shell); 628 DISALLOW_COPY_AND_ASSIGN(Shell);
627 }; 629 };
628 630
629 } // namespace ash 631 } // namespace ash
630 632
631 #endif // ASH_SHELL_H_ 633 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698