Change the idle logout dialog over to use views.

chrome/browser/chromeos/ui/idle_logout_dialog_view.cc

Index: chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..59faf8927012d4841bd2f82ee1055b7f742bd813
--- /dev/null
+++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
@@ -0,0 +1,196 @@
+// 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 "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/time.h"
+#include "base/timer.h"

[tfarina, 2012/03/14 22:55:34]

nit: already included in the header, remove.

[rkc, 2012/03/14 23:19:29]

Done.

+#include "base/string_number_conversions.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/logging_chrome.h"

[tfarina, 2012/03/14 22:55:34]

can you remove this as well?

[rkc, 2012/03/14 23:19:29]

Done.

+#include "grit/browser_resources.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/layout_constants.h"
+#include "ui/views/widget/widget.h"
+
+#if defined(USE_AURA)
+#include "ash/shell.h"

[tfarina, 2012/03/14 22:55:34]

What do you need these includes for?

[rkc, 2012/03/14 23:19:29]

Already removed in the latest patch.

+#include "ui/aura/root_window.h"
+#endif
+
+namespace {
+
+// Global singleton instance of our dialog class.
+IdleLogoutDialogView* g_instance = NULL;
+
+const int kIdleLogoutDialogMaxWidth = 400;
+const int kCountdownUpdateInterval = 1; // second.
+
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+// IdleLogoutDialog public static methods

[tfarina, 2012/03/14 22:55:34]

nit: IdleLogoutDialogView

[rkc, 2012/03/14 23:19:29]

Done.

+void IdleLogoutDialogView::ShowDialog() {
+  if (!g_instance) {
+    g_instance = new IdleLogoutDialogView();
+    g_instance->Init();
+  }
+  g_instance->Show();
+}
+
+void IdleLogoutDialogView::CloseDialog() {
+  if (g_instance) {
+    g_instance->set_closed();
+    g_instance->Close();
+    g_instance = NULL;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Overridden from views::DialogDelegateView
+int IdleLogoutDialogView::GetDialogButtons() const {
+  return ui::DIALOG_BUTTON_NONE;
+}
+
+ui::ModalType IdleLogoutDialogView::GetModalType() const {
+  return ui::MODAL_TYPE_WINDOW;
+}
+
+string16 IdleLogoutDialogView::GetWindowTitle() const {
+  return l10n_util::GetStringUTF16(IDS_IDLE_LOGOUT_TITLE);
+}
+
+views::View* IdleLogoutDialogView::GetContentsView() {
+  return this;
+}
+
+void IdleLogoutDialogView::DeleteDelegate() {
+  // There isn't a delegate method that is called on close and is 'not' called
+  // async; this can cause an issue with us setting the g_instance to NULL
+  // 'after' another Show call has been called on it. So instead, we rely on
+  // CloseIdleLogoutDialog to set g_instance to NULL; in the case that we get
+  // closed by any other way than CloseIdleLogoutDialog, we check if our
+  // 'closed' state is set - if not, then we set it and set g_instance to null,
+  // since that means that CloseIdleLogoutDialog was never called.
+  if (!this->is_closed()) {
+    g_instance->set_closed();
+    g_instance = NULL;
+  }
+
+  // CallInit succeeded, hence didn't free this pointer, free it here.
+  if (chromeos::KioskModeHelper::Get()->is_initialized())
+    delete instance_holder_;
+
+  delete this;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Overridden from views::View
+void IdleLogoutDialogView::Layout() {

[tfarina, 2012/03/14 22:55:34]

Do you still need to override this?

[rkc, 2012/03/14 23:19:29]

Doesn't seem like it anymore.
Done.

+  GetLayoutManager()->Layout(this);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// IdleLogoutDialog private methods
+IdleLogoutDialogView::IdleLogoutDialogView() : restart_label_(NULL),
+                                               warning_label_(NULL) {
+  instance_holder_ = new IdleLogoutDialogView*(this);
+}
+
+// static
+void IdleLogoutDialogView::CallInit(IdleLogoutDialogView** instance_holder) {
+  if (*instance_holder)
+    (*instance_holder)->Init();
+  else
+    // Our class is gone, free the holder memory.
+    delete instance_holder;
+}
+
+void IdleLogoutDialogView::Init() {
+  if (!chromeos::KioskModeHelper::Get()->is_initialized()) {
+    chromeos::KioskModeHelper::Get()->Initialize(
+            base::Bind(&IdleLogoutDialogView::CallInit, instance_holder_));

[tfarina, 2012/03/14 22:55:34]

nit: indent 4 spaces only.

[rkc, 2012/03/14 23:19:29]

Done.

+    return;
+  }
+
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+
+  warning_label_ = new views::Label(
+      l10n_util::GetStringUTF16(IDS_IDLE_LOGOUT_WARNING));
+  warning_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  warning_label_->SetMultiLine(true);
+  warning_label_->SetFont(rb.GetFont(ui::ResourceBundle::BaseFont));
+  warning_label_->SizeToFit(kIdleLogoutDialogMaxWidth);
+
+  restart_label_ = new views::Label();
+  restart_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  restart_label_->SetFont(rb.GetFont(ui::ResourceBundle::BoldFont));
+  warning_label_->SizeToFit(kIdleLogoutDialogMaxWidth);

[tfarina, 2012/03/14 22:55:34]

nit: called twice? first in line 131 and then now here. Is this intentional?

[rkc, 2012/03/14 23:19:29]

Done.

+
+  views::GridLayout* layout = views::GridLayout::CreatePanel(this);
+  SetLayoutManager(layout);
+
+  views::ColumnSet* column_set = layout->AddColumnSet(0);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER, 1,
+                        views::GridLayout::USE_PREF, 0, 0);
+  layout->StartRow(0, 0);
+  layout->AddView(warning_label_);
+  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+  layout->StartRow(0, 0);
+  layout->AddView(restart_label_);
+}
+
+void IdleLogoutDialogView::Show() {
+  // Setup the countdown label before showing.
+  countdown_end_time_ = base::Time::Now() + base::TimeDelta::FromSeconds(
+      chromeos::KioskModeHelper::Get()->GetIdleLogoutWarningTimeout());
+  UpdateCountdownTimer();
+
+  views::Widget::CreateWindow(this);
+  GetWidget()->SetAlwaysOnTop(true);
+  GetWidget()->Show();
+
+  // Update countdown every 1 second.
+  timer_.Start(FROM_HERE,
+               base::TimeDelta::FromSeconds(kCountdownUpdateInterval),
+               this,
+               &IdleLogoutDialogView::UpdateCountdownTimer);
+}
+
+void IdleLogoutDialogView::Close() {
+  DCHECK(GetWidget());
+
+  timer_.Stop();
+  GetWidget()->Close();
+}
+
+void IdleLogoutDialogView::UpdateCountdownTimer() {
+  base::TimeDelta logout_warning_time = countdown_end_time_ -
+                                        base::Time::Now();
+  int64 seconds_left = (logout_warning_time.InMillisecondsF() /
+                        base::Time::kMillisecondsPerSecond) + 0.5;
+
+  if (seconds_left > 1) {
+    restart_label_->SetText(l10n_util::GetStringFUTF16(
+        IDS_IDLE_LOGOUT_WARNING_RESTART,
+        base::Int64ToString16(seconds_left)));
+  } else if (seconds_left > 0) {
+    restart_label_->SetText(l10n_util::GetStringUTF16(
+        IDS_IDLE_LOGOUT_WARNING_RESTART_1S));
+  } else {
+    // Set the label - the logout probably won't be instant.
+    restart_label_->SetText(l10n_util::GetStringUTF16(
+        IDS_IDLE_LOGOUT_WARNING_RESTART_NOW));
+
+    // Logout the current user.
+    BrowserList::AttemptUserExit();
+  }
+}