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

Side by Side Diff: ash/shell.h

Issue 2524863003: Move DisplayChangeObserver + tests from ash to ui. (Closed)
Patch Set: Rebase (again.. again.) Created 4 years 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/display/display_change_observer_chromeos_unittest.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 21 matching lines...) Expand all
32 class ActivationClient; 32 class ActivationClient;
33 class FocusClient; 33 class FocusClient;
34 } 34 }
35 } 35 }
36 36
37 namespace chromeos { 37 namespace chromeos {
38 class AudioA11yController; 38 class AudioA11yController;
39 } 39 }
40 40
41 namespace display { 41 namespace display {
42 class DisplayChangeObserver;
42 class DisplayManager; 43 class DisplayManager;
43 } 44 }
44 45
45 namespace gfx { 46 namespace gfx {
46 class Rect; 47 class Rect;
47 } 48 }
48 49
49 namespace ui { 50 namespace ui {
50 class DisplayConfigurator; 51 class DisplayConfigurator;
51 class UserActivityDetector; 52 class UserActivityDetector;
(...skipping 14 matching lines...) Expand all
66 class VisibilityController; 67 class VisibilityController;
67 class WindowModalityController; 68 class WindowModalityController;
68 } 69 }
69 70
70 namespace ash { 71 namespace ash {
71 72
72 class AcceleratorControllerDelegateAura; 73 class AcceleratorControllerDelegateAura;
73 class AshNativeCursorManager; 74 class AshNativeCursorManager;
74 class AutoclickController; 75 class AutoclickController;
75 class BluetoothNotificationController; 76 class BluetoothNotificationController;
76 class DisplayChangeObserver;
77 class DisplayColorManager; 77 class DisplayColorManager;
78 class DisplayConfigurationController; 78 class DisplayConfigurationController;
79 class DisplayErrorObserver; 79 class DisplayErrorObserver;
80 class DragDropController; 80 class DragDropController;
81 class EventClientImpl; 81 class EventClientImpl;
82 class EventTransformationHandler; 82 class EventTransformationHandler;
83 class FirstRunHelper; 83 class FirstRunHelper;
84 class GPUSupport; 84 class GPUSupport;
85 class HighContrastController; 85 class HighContrastController;
86 class ImmersiveHandlerFactoryAsh; 86 class ImmersiveHandlerFactoryAsh;
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 bluetooth_notification_controller_; 502 bluetooth_notification_controller_;
503 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_; 503 std::unique_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
504 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_; 504 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
505 // Controls video output device state. 505 // Controls video output device state.
506 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; 506 std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
507 std::unique_ptr<DisplayColorManager> display_color_manager_; 507 std::unique_ptr<DisplayColorManager> display_color_manager_;
508 std::unique_ptr<DisplayErrorObserver> display_error_observer_; 508 std::unique_ptr<DisplayErrorObserver> display_error_observer_;
509 std::unique_ptr<ProjectingObserver> projecting_observer_; 509 std::unique_ptr<ProjectingObserver> projecting_observer_;
510 510
511 // Listens for output changes and updates the display manager. 511 // Listens for output changes and updates the display manager.
512 std::unique_ptr<DisplayChangeObserver> display_change_observer_; 512 std::unique_ptr<display::DisplayChangeObserver> display_change_observer_;
513 513
514 // Listens for shutdown and updates DisplayConfigurator. 514 // Listens for shutdown and updates DisplayConfigurator.
515 std::unique_ptr<ShutdownObserver> shutdown_observer_; 515 std::unique_ptr<ShutdownObserver> shutdown_observer_;
516 516
517 // Implements content::ScreenOrientationController for ChromeOS 517 // Implements content::ScreenOrientationController for ChromeOS
518 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 518 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
519 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; 519 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_;
520 520
521 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 521 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
522 522
(...skipping 21 matching lines...) Expand all
544 std::unique_ptr<GPUSupport> gpu_support_; 544 std::unique_ptr<GPUSupport> gpu_support_;
545 545
546 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 546 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
547 547
548 DISALLOW_COPY_AND_ASSIGN(Shell); 548 DISALLOW_COPY_AND_ASSIGN(Shell);
549 }; 549 };
550 550
551 } // namespace ash 551 } // namespace ash
552 552
553 #endif // ASH_SHELL_H_ 553 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/display/display_change_observer_chromeos_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698