Provides more types of errors for output status.

ash/display/display_error_dialog.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/display/display_error_dialog.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "grit/ash_strings.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
 // The width of the area to show the error message.
 const int kDialogMessageWidthPixel = 300;
 
 // The margin width from the error message to the edge of the dialog.
 const int kDialogMessageMarginWidthPixel = 5;
 
-DisplayErrorDialog* g_instance = NULL;
-
 }  // namespace
 
 // static
-void  DisplayErrorDialog::ShowDialog() {
-  if (g_instance) {
-    DCHECK(g_instance->GetWidget());
-    g_instance->GetWidget()->StackAtTop();
-    g_instance->GetWidget()->Activate();
-    return;
-  }
-
+DisplayErrorDialog* DisplayErrorDialog::ShowDialog(
+    chromeos::OutputState new_state) {
   gfx::Screen* screen = Shell::GetScreen();
   const gfx::Display& target_display =
       (screen->GetNumDisplays() > 1) ?
       ScreenAsh::GetSecondaryDisplay() : screen->GetPrimaryDisplay();
 
-  g_instance = new DisplayErrorDialog();
+  DisplayErrorDialog* dialog = new DisplayErrorDialog(new_state);
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
-  params.delegate = g_instance;
+  params.delegate = dialog;
   // Makes |widget| belong to the target display.  Size and location are
   // fixed by CenterWindow() below.
   params.bounds = target_display.bounds();
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
   params.context =
       display_controller->GetRootWindowForDisplayId(target_display.id());
   params.keep_on_top = true;
   widget->Init(params);
 
   widget->GetNativeView()->SetName("DisplayErrorDialog");
   widget->CenterWindow(widget->GetRootView()->GetPreferredSize());
   widget->Show();
+  return dialog;
 }
 
-DisplayErrorDialog::DisplayErrorDialog() {
+void DisplayErrorDialog::UpdateMessageForState(
+    chromeos::OutputState new_state) {
+  int message_id = -1;
+  switch (new_state) {
+    case chromeos::STATE_DUAL_MIRROR:
+      message_id = IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING;
+      break;
+    case chromeos::STATE_DUAL_PRIMARY_ONLY:
+    case chromeos::STATE_DUAL_SECONDARY_ONLY:
+      message_id = IDS_ASH_DISPLAY_FAILURE_ON_EXTENDED;
+      break;
+    default:
+      // The error dialog would appear only for mirroring or extended.
+      // It's quite unlikely to happen with other status (single-display /
+      // invalid / unknown status), but set an unknown error message
+      // instead of NOTREACHED() just in case for safety.
+      message_id = IDS_ASH_DISPLAY_FAILURE_UNKNOWN;

[oshima, 2013/02/26 18:27:22]

log error with the new_state as it shouldn't happen.

[Jun Mukai, 2013/02/28 22:57:36]

Done.

+  }
+  label_->SetText(l10n_util::GetStringUTF16(message_id));
+  label_->SizeToFit(kDialogMessageWidthPixel);
+  Layout();
+  SchedulePaint();
+}
+
+DisplayErrorDialog::DisplayErrorDialog(chromeos::OutputState new_state) {
   Shell::GetInstance()->display_controller()->AddObserver(this);
-  label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING));
+  label_ = new views::Label();
   AddChildView(label_);
 
   label_->SetMultiLine(true);
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label_->set_border(views::Border::CreateEmptyBorder(
       kDialogMessageMarginWidthPixel,
       kDialogMessageMarginWidthPixel,
       kDialogMessageMarginWidthPixel,
       kDialogMessageMarginWidthPixel));
-  label_->SizeToFit(kDialogMessageWidthPixel);
+
+  UpdateMessageForState(new_state);
 }
 
 DisplayErrorDialog::~DisplayErrorDialog() {
   Shell::GetInstance()->display_controller()->RemoveObserver(this);
-  g_instance = NULL;
 }
 
 int DisplayErrorDialog::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_OK;
 }
 
 ui::ModalType DisplayErrorDialog::GetModalType() const {
   return ui::MODAL_TYPE_NONE;
 }
 
 gfx::Size DisplayErrorDialog::GetPreferredSize() {
   return label_->GetPreferredSize();
 }
 
 void DisplayErrorDialog::OnDisplayConfigurationChanging() {
   GetWidget()->Close();
 }
 
-// static
-DisplayErrorDialog* DisplayErrorDialog::GetInstanceForTest() {
-  return g_instance;
+DisplayErrorObserver::DisplayErrorObserver()
+    : dialog_(NULL) {
+}
+
+DisplayErrorObserver::~DisplayErrorObserver() {

[oshima, 2013/02/26 18:27:22]

DCHECK(!dialog_)

to make sure the dialog gets closed before the observer is
removed.

[Jun Mukai, 2013/02/28 22:57:36]

Done.

+}
+
+void DisplayErrorObserver::OnDisplayModeChangeFailed(
+    chromeos::OutputState new_state) {
+  if (dialog_) {
+    DCHECK(dialog_->GetWidget());
+    dialog_->UpdateMessageForState(new_state);
+    dialog_->GetWidget()->StackAtTop();
+    dialog_->GetWidget()->Activate();
+  } else {
+    dialog_ = DisplayErrorDialog::ShowDialog(new_state);
+  }
+}
+
+void DisplayErrorObserver::OnWidgetClosing(views::Widget* widget) {
+  DCHECK(dialog_);
+  DCHECK_EQ(dialog_->GetWidget(), widget);
+  widget->RemoveObserver(this);
+  dialog_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash