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

Side by Side Diff: ash/shell.h

Issue 22703004: Creates notifications for display resolution change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix on display_preferences_unittest 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/resolution_notification_controller_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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
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;
116 class OverlayEventFilter; 116 class OverlayEventFilter;
117 class ResizeShadowController; 117 class ResizeShadowController;
118 class ResolutionNotificationController;
118 class RootWindowController; 119 class RootWindowController;
119 class RootWindowLayoutManager; 120 class RootWindowLayoutManager;
120 class ScopedTargetRootWindow; 121 class ScopedTargetRootWindow;
121 class ScreenPositionController; 122 class ScreenPositionController;
122 class SlowAnimationEventFilter; 123 class SlowAnimationEventFilter;
123 class StatusAreaWidget; 124 class StatusAreaWidget;
124 class SystemGestureEventFilter; 125 class SystemGestureEventFilter;
125 class SystemModalContainerEventFilter; 126 class SystemModalContainerEventFilter;
126 class TouchObserverHUD; 127 class TouchObserverHUD;
127 } 128 }
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 return output_configurator_.get(); 444 return output_configurator_.get();
444 } 445 }
445 internal::OutputConfiguratorAnimation* output_configurator_animation() { 446 internal::OutputConfiguratorAnimation* output_configurator_animation() {
446 return output_configurator_animation_.get(); 447 return output_configurator_animation_.get();
447 } 448 }
448 internal::DisplayErrorObserver* display_error_observer() { 449 internal::DisplayErrorObserver* display_error_observer() {
449 return display_error_observer_.get(); 450 return display_error_observer_.get();
450 } 451 }
451 #endif // defined(OS_CHROMEOS) && defined(USE_X11) 452 #endif // defined(OS_CHROMEOS) && defined(USE_X11)
452 453
454 internal::ResolutionNotificationController*
455 resolution_notification_controller() {
456 return resolution_notification_controller_.get();
457 }
458
453 RootWindowHostFactory* root_window_host_factory() { 459 RootWindowHostFactory* root_window_host_factory() {
454 return root_window_host_factory_.get(); 460 return root_window_host_factory_.get();
455 } 461 }
456 462
457 LauncherModel* launcher_model() { 463 LauncherModel* launcher_model() {
458 return launcher_model_.get(); 464 return launcher_model_.get();
459 } 465 }
460 466
461 // Returns the launcher delegate, creating if necesary. 467 // Returns the launcher delegate, creating if necesary.
462 LauncherDelegate* GetLauncherDelegate(); 468 LauncherDelegate* GetLauncherDelegate();
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 // Controls video output device state. 606 // Controls video output device state.
601 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 607 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
602 scoped_ptr<internal::OutputConfiguratorAnimation> 608 scoped_ptr<internal::OutputConfiguratorAnimation>
603 output_configurator_animation_; 609 output_configurator_animation_;
604 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; 610 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
605 611
606 // Receives output change events and udpates the display manager. 612 // Receives output change events and udpates the display manager.
607 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; 613 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
608 #endif // defined(OS_CHROMEOS) && defined(USE_X11) 614 #endif // defined(OS_CHROMEOS) && defined(USE_X11)
609 615
616 scoped_ptr<internal::ResolutionNotificationController>
617 resolution_notification_controller_;
618
610 // |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
611 // pointer to vend to test code. 620 // pointer to vend to test code.
612 AshNativeCursorManager* native_cursor_manager_; 621 AshNativeCursorManager* native_cursor_manager_;
613 views::corewm::CursorManager cursor_manager_; 622 views::corewm::CursorManager cursor_manager_;
614 623
615 ObserverList<ShellObserver> observers_; 624 ObserverList<ShellObserver> observers_;
616 625
617 // Used by ash/shell. 626 // Used by ash/shell.
618 content::BrowserContext* browser_context_; 627 content::BrowserContext* browser_context_;
619 628
620 // For testing only: simulate that a modal window is open 629 // For testing only: simulate that a modal window is open
621 bool simulate_modal_window_open_for_testing_; 630 bool simulate_modal_window_open_for_testing_;
622 631
623 bool is_touch_hud_projection_enabled_; 632 bool is_touch_hud_projection_enabled_;
624 633
625 DISALLOW_COPY_AND_ASSIGN(Shell); 634 DISALLOW_COPY_AND_ASSIGN(Shell);
626 }; 635 };
627 636
628 } // namespace ash 637 } // namespace ash
629 638
630 #endif // ASH_SHELL_H_ 639 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/display/resolution_notification_controller_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698