Provides more types of errors for output status.

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 88 matching lines @@
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ash/ash_constants.h"
 #include "ash/display/display_change_observer_x11.h"
+#include "ash/display/display_error_dialog.h"
 #include "ash/display/output_configurator_animation.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_pump_aurax11.h"
 #include "chromeos/display/output_configurator.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/gpu_feature_type.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
@@ skipping 180 matching lines @@
   display_controller_.reset();
   screen_position_controller_.reset();
 
   // Delete the activation controller after other controllers and launcher
   // because they might have registered ActivationChangeObserver.
   activation_controller_.reset();
 
   DCHECK(instance_ == this);
   instance_ = NULL;
 
 #if defined(OS_CHROMEOS)

[James Cook, 2013/03/01 00:20:17]

It seems like this entire block should go above instance_ = NULL (in case one of
these observers needs to access Shell during cleanup), or instance_ = NULL
should go at the top of this function.  Don't change it for this patch, but it's
something for you and Oshima to think about.

[oshima, 2013/03/01 00:43:07]

I made the change in https://codereview.chromium.org/12367007/
so that observer won't be called during shutdown. I do agree
that it still makes sense to move it before = NULL though, 
just in case.

[Jun Mukai, 2013/03/01 01:32:54]

Done.

   if (display_change_observer_.get())
     output_configurator_->RemoveObserver(display_change_observer_.get());
   if (output_configurator_animation_.get())
     output_configurator_->RemoveObserver(output_configurator_animation_.get());
+  if (display_error_observer_.get())
+    output_configurator_->RemoveObserver(display_error_observer_.get());
   base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow(
       output_configurator());
 #endif  // defined(OS_CHROMEOS)
 }
 
 // static
 Shell* Shell::CreateInstance(ShellDelegate* delegate) {
   CHECK(!instance_);
   instance_ = new Shell(delegate);
   instance_->Init();
@@ skipping 87 matching lines @@
 }
 
 void Shell::Init() {
 #if defined(OS_CHROMEOS)
   if (base::chromeos::IsRunningOnChromeOS()) {
     display_change_observer_.reset(new internal::DisplayChangeObserverX11);
     // Register |display_change_observer_| first so that the rest of
     // observer gets invoked after the root windows are configured.
     output_configurator_->AddObserver(display_change_observer_.get());
     output_configurator_animation_.reset(
-        new internal::OutputConfiguratorAnimation()),
+        new internal::OutputConfiguratorAnimation());
+    display_error_observer_.reset(new internal::DisplayErrorObserver());
     output_configurator_->AddObserver(output_configurator_animation_.get());
+    output_configurator_->AddObserver(display_error_observer_.get());
     display_change_observer_->OnDisplayModeChanged();
   }
 #endif
 
   // Install the custom factory first so that views::FocusManagers for Tray,
   // Launcher, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
   env_filter_.reset(new views::corewm::CompoundEventFilter);
   AddPreTargetHandler(env_filter_.get());
@@ skipping 510 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     active_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash