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

Side by Side Diff: ash/shell.h

Issue 12212171: Provides more types of errors for output status. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 class VideoDetector; 94 class VideoDetector;
95 class WebNotificationTray; 95 class WebNotificationTray;
96 class WindowCycleController; 96 class WindowCycleController;
97 97
98 namespace internal { 98 namespace internal {
99 class AcceleratorFilter; 99 class AcceleratorFilter;
100 class ActivationController; 100 class ActivationController;
101 class AppListController; 101 class AppListController;
102 class CaptureController; 102 class CaptureController;
103 class DisplayChangeObserverX11; 103 class DisplayChangeObserverX11;
104 class DisplayErrorObserver;
104 class DisplayManager; 105 class DisplayManager;
105 class DragDropController; 106 class DragDropController;
106 class EventClientImpl; 107 class EventClientImpl;
107 class EventRewriterEventFilter; 108 class EventRewriterEventFilter;
108 class EventTransformationHandler; 109 class EventTransformationHandler;
109 class FocusCycler; 110 class FocusCycler;
110 class MouseCursorEventFilter; 111 class MouseCursorEventFilter;
111 class OutputConfiguratorAnimation; 112 class OutputConfiguratorAnimation;
112 class OverlayEventFilter; 113 class OverlayEventFilter;
113 class ResizeShadowController; 114 class ResizeShadowController;
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 // Starts the animation that occurs on first login. 427 // Starts the animation that occurs on first login.
427 void DoInitialWorkspaceAnimation(); 428 void DoInitialWorkspaceAnimation();
428 429
429 #if defined(OS_CHROMEOS) 430 #if defined(OS_CHROMEOS)
430 chromeos::OutputConfigurator* output_configurator() { 431 chromeos::OutputConfigurator* output_configurator() {
431 return output_configurator_.get(); 432 return output_configurator_.get();
432 } 433 }
433 internal::OutputConfiguratorAnimation* output_configurator_animation() { 434 internal::OutputConfiguratorAnimation* output_configurator_animation() {
434 return output_configurator_animation_.get(); 435 return output_configurator_animation_.get();
435 } 436 }
437 internal::DisplayErrorObserver* display_error_observer() {
438 return display_error_observer_.get();
439 }
436 #endif // defined(OS_CHROMEOS) 440 #endif // defined(OS_CHROMEOS)
437 441
438 RootWindowHostFactory* root_window_host_factory() { 442 RootWindowHostFactory* root_window_host_factory() {
439 return root_window_host_factory_.get(); 443 return root_window_host_factory_.get();
440 } 444 }
441 445
442 // MessageCenter is a global list of currently displayed notifications. 446 // MessageCenter is a global list of currently displayed notifications.
443 message_center::MessageCenter* message_center(); 447 message_center::MessageCenter* message_center();
444 448
445 private: 449 private:
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 // a heads-up display. This is enabled only if --ash-touch-hud flag is used. 575 // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
572 scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_; 576 scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
573 577
574 scoped_ptr<internal::DisplayManager> display_manager_; 578 scoped_ptr<internal::DisplayManager> display_manager_;
575 579
576 #if defined(OS_CHROMEOS) 580 #if defined(OS_CHROMEOS)
577 // Controls video output device state. 581 // Controls video output device state.
578 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; 582 scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
579 scoped_ptr<internal::OutputConfiguratorAnimation> 583 scoped_ptr<internal::OutputConfiguratorAnimation>
580 output_configurator_animation_; 584 output_configurator_animation_;
585 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
581 586
582 // Receives output change events and udpates the display manager. 587 // Receives output change events and udpates the display manager.
583 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; 588 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
584 #endif // defined(OS_CHROMEOS) 589 #endif // defined(OS_CHROMEOS)
585 590
586 scoped_ptr<message_center::MessageCenter> message_center_; 591 scoped_ptr<message_center::MessageCenter> message_center_;
587 592
588 CursorManager cursor_manager_; 593 CursorManager cursor_manager_;
589 594
590 ObserverList<ShellObserver> observers_; 595 ObserverList<ShellObserver> observers_;
591 596
592 // Used by ash/shell. 597 // Used by ash/shell.
593 content::BrowserContext* browser_context_; 598 content::BrowserContext* browser_context_;
594 599
595 // For testing only: simulate that a modal window is open 600 // For testing only: simulate that a modal window is open
596 bool simulate_modal_window_open_for_testing_; 601 bool simulate_modal_window_open_for_testing_;
597 602
598 DISALLOW_COPY_AND_ASSIGN(Shell); 603 DISALLOW_COPY_AND_ASSIGN(Shell);
599 }; 604 };
600 605
601 } // namespace ash 606 } // namespace ash
602 607
603 #endif // ASH_SHELL_H_ 608 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698