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

Side by Side Diff: ash/shell.h

Issue 23286003: ash: Get output info from chromeos instead of XRandR. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use index from XRandR Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/display_util_x11_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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 class VideoDetector; 95 class VideoDetector;
96 class WebNotificationTray; 96 class WebNotificationTray;
97 class WindowCycleController; 97 class WindowCycleController;
98 class WindowSelectorController; 98 class WindowSelectorController;
99 99
100 namespace internal { 100 namespace internal {
101 class AcceleratorFilter; 101 class AcceleratorFilter;
102 class ActivationController; 102 class ActivationController;
103 class AppListController; 103 class AppListController;
104 class CaptureController; 104 class CaptureController;
105 class DisplayChangeObserverX11; 105 class DisplayChangeObserver;
106 class DisplayErrorObserver; 106 class DisplayErrorObserver;
107 class DisplayManager; 107 class DisplayManager;
108 class DragDropController; 108 class DragDropController;
109 class EventClientImpl; 109 class EventClientImpl;
110 class EventRewriterEventFilter; 110 class EventRewriterEventFilter;
111 class EventTransformationHandler; 111 class EventTransformationHandler;
112 class FocusCycler; 112 class FocusCycler;
113 class LocaleNotificationController; 113 class LocaleNotificationController;
114 class MouseCursorEventFilter; 114 class MouseCursorEventFilter;
115 class OutputConfiguratorAnimation; 115 class OutputConfiguratorAnimation;
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 scoped_ptr<internal::LocaleNotificationController> 602 scoped_ptr<internal::LocaleNotificationController>
603 locale_notification_controller_; 603 locale_notification_controller_;
604 604
605 #if defined(OS_CHROMEOS) && defined(USE_X11) 605 #if defined(OS_CHROMEOS) && defined(USE_X11)
606 // Controls video output device state. 606 // Controls video output device state.
607 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 607 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
608 scoped_ptr<internal::OutputConfiguratorAnimation> 608 scoped_ptr<internal::OutputConfiguratorAnimation>
609 output_configurator_animation_; 609 output_configurator_animation_;
610 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; 610 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
611 611
612 // Receives output change events and udpates the display manager. 612 // Listens for output changes and updates the display manager.
613 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; 613 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_;
614 #endif // defined(OS_CHROMEOS) && defined(USE_X11) 614 #endif // defined(OS_CHROMEOS) && defined(USE_X11)
615 615
616 scoped_ptr<internal::ResolutionNotificationController> 616 scoped_ptr<internal::ResolutionNotificationController>
617 resolution_notification_controller_; 617 resolution_notification_controller_;
618 618
619 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 619 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
620 // pointer to vend to test code. 620 // pointer to vend to test code.
621 AshNativeCursorManager* native_cursor_manager_; 621 AshNativeCursorManager* native_cursor_manager_;
622 views::corewm::CursorManager cursor_manager_; 622 views::corewm::CursorManager cursor_manager_;
623 623
624 ObserverList<ShellObserver> observers_; 624 ObserverList<ShellObserver> observers_;
625 625
626 // Used by ash/shell. 626 // Used by ash/shell.
627 content::BrowserContext* browser_context_; 627 content::BrowserContext* browser_context_;
628 628
629 // For testing only: simulate that a modal window is open 629 // For testing only: simulate that a modal window is open
630 bool simulate_modal_window_open_for_testing_; 630 bool simulate_modal_window_open_for_testing_;
631 631
632 bool is_touch_hud_projection_enabled_; 632 bool is_touch_hud_projection_enabled_;
633 633
634 DISALLOW_COPY_AND_ASSIGN(Shell); 634 DISALLOW_COPY_AND_ASSIGN(Shell);
635 }; 635 };
636 636
637 } // namespace ash 637 } // namespace ash
638 638
639 #endif // ASH_SHELL_H_ 639 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/display/display_util_x11_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698