Provides more types of errors for output status.

ash/shell.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 85 matching lines @@
 class VideoDetector;
 class WebNotificationTray;
 class WindowCycleController;
 
 namespace internal {
 class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
 class DisplayChangeObserverX11;
+class DisplayErrorObserver;
 class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
 class EventTransformationHandler;
 class FocusCycler;
 class MouseCursorEventFilter;
 class OutputConfiguratorAnimation;
 class OverlayEventFilter;
 class ResizeShadowController;
@@ skipping 311 matching lines @@
   // Starts the animation that occurs on first login.
   void DoInitialWorkspaceAnimation();
 
 #if defined(OS_CHROMEOS)
   chromeos::OutputConfigurator* output_configurator() {
     return output_configurator_.get();
   }
   internal::OutputConfiguratorAnimation* output_configurator_animation() {
     return output_configurator_animation_.get();
   }
+  internal::DisplayErrorObserver* display_error_observer() {
+    return display_error_observer_.get();
+  }
 #endif  // defined(OS_CHROMEOS)
 
   RootWindowHostFactory* root_window_host_factory() {
     return root_window_host_factory_.get();
   }
 
   // MessageCenter is a global list of currently displayed notifications.
   message_center::MessageCenter* message_center();
 
  private:
@@ skipping 125 matching lines @@
   // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
   scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
 
   scoped_ptr<internal::DisplayManager> display_manager_;
 
 #if defined(OS_CHROMEOS)
   // Controls video output device state.
   scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
   scoped_ptr<internal::OutputConfiguratorAnimation>
       output_configurator_animation_;
+  scoped_ptr<internal::DisplayErrorObserver> display_error_observer_;
 
   // Receives output change events and udpates the display manager.
   scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
 #endif  // defined(OS_CHROMEOS)
 
   scoped_ptr<message_center::MessageCenter> message_center_;
 
   // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
   // pointer to vend to test code.
   AshNativeCursorManager* native_cursor_manager_;
   views::corewm::CursorManager cursor_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   // For testing only: simulate that a modal window is open
   bool simulate_modal_window_open_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_