Revert 185456 which broke win aura build.

> Provides more types of errors for display status.
> 
> Note that the text message itself is a placeholder. It has to be replaced
> by real sentences.
> 
> BUG=176011
> TEST=ash_unittests passes
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/12212171

TBR=mukai@chromium.org
Review URL: https://codereview.chromium.org/12386043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185466 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 15 deletions

diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc
index 4357b1a..00c0f72 100644
--- a/chromeos/display/output_configurator.cc
+++ b/chromeos/display/output_configurator.cc
@@ -654,12 +654,10 @@ bool OutputConfigurator::CycleDisplayMode() {
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
 
-  if (did_change) {
+  if (did_change)
     NotifyOnDisplayChanged();
-  } else {
-    FOR_EACH_OBSERVER(
-        Observer, observers_, OnDisplayModeChangeFailed(next_state));
-  }
+  else
+    FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChangeFailed());
   return did_change;
 }
 
@@ -761,12 +759,10 @@ bool OutputConfigurator::SetDisplayMode(OutputState new_state) {
   XRRFreeScreenResources(screen);
   XUngrabServer(display);
 
-  if (output_state_ == new_state) {
+  if (output_state_ == new_state)
     NotifyOnDisplayChanged();
-  } else {
-    FOR_EACH_OBSERVER(
-        Observer, observers_, OnDisplayModeChangeFailed(new_state));
-  }
+  else
+    FOR_EACH_OBSERVER(Observer, observers_, OnDisplayModeChangeFailed());
   return true;
 }
 
@@ -837,9 +833,6 @@ void OutputConfigurator::ConfigureOutputs() {
   if (success) {
     output_state_ = new_state;
     NotifyOnDisplayChanged();
-  } else {
-    FOR_EACH_OBSERVER(
-        Observer, observers_, OnDisplayModeChangeFailed(new_state));
   }
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       SetIsProjecting(is_projecting);
diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h
index 804f856..cd3420a 100644
--- a/chromeos/display/output_configurator.h
+++ b/chromeos/display/output_configurator.h
@@ -57,8 +57,7 @@ class CHROMEOS_EXPORT OutputConfigurator : public MessageLoop::Dispatcher {
     virtual void OnDisplayModeChanged() {}
 
     // Called when the change of the display mode is issued but failed.
-    // |failed_new_state| is the new state which the system failed to enter.
-    virtual void OnDisplayModeChangeFailed(OutputState failed_new_state) {}
+    virtual void OnDisplayModeChangeFailed() {}
   };
 
   OutputConfigurator();