Create a dialog that warns about possible UI-oddities of the multi-profiles window teleport

chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc

Index: chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc
diff --git a/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc b/chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc
similarity index 74%
copy from chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc
copy to chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc
index c5b0261d9c03f168b9c7ddca893eca9ca54b0391..ae9a1012b47c4a90bf327bbc47ff270183f57511 100644
--- a/chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.h"
 
 #include "ash/shell.h"
 #include "grit/generated_resources.h"
@@ -22,17 +22,17 @@ namespace {
 const int kDefaultWidth = 600;
 const int kDefaultHeight = 250;
 
-const int kPaddingToMessage = 20;
+const int kPaddingToMessage = 30;
 const int kPaddingToCheckBox = 50;
 const int kInset = 40;
 const int kTopInset = 10;
 
 ////////////////////////////////////////////////////////////////////////////////
-// Dialog for multi-profiles introduction.
-class MultiprofilesIntroView : public views::DialogDelegateView {
+// Dialog for multi-profiles teleport warning.
+class TeleportWarningView : public views::DialogDelegateView {
  public:
-  explicit MultiprofilesIntroView(const base::Callback<void(bool)> on_accept);
-  virtual ~MultiprofilesIntroView();
+  TeleportWarningView(base::Callback<void(bool)> on_accept);
+  virtual ~TeleportWarningView();
 
   static void ShowDialog(const base::Callback<void(bool)> on_accept);
 
@@ -45,31 +45,33 @@ class MultiprofilesIntroView : public views::DialogDelegateView {
   // views::View overrides.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
+  static int reciever_user_id;

[ygorshenin1, 2014/01/29 09:24:04]

s/reciever/receiver/

Why do you need this static field?

[merkulova, 2014/01/29 09:46:21]

It was a trash line, sorry.

+
  private:
   void InitDialog();
 
   scoped_ptr<views::Checkbox> no_show_checkbox_;
   const base::Callback<void(bool)> on_accept_;
 
-  DISALLOW_COPY_AND_ASSIGN(MultiprofilesIntroView);
+  DISALLOW_COPY_AND_ASSIGN(TeleportWarningView);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
-// MultiprofilesIntroDialog implementation.
+// TeleportWarningView implementation.
 
-MultiprofilesIntroView::MultiprofilesIntroView(
+TeleportWarningView::TeleportWarningView(
     const base::Callback<void(bool)> on_accept)
     : on_accept_(on_accept) {
 }
 
-MultiprofilesIntroView::~MultiprofilesIntroView() {
+TeleportWarningView::~TeleportWarningView() {
 }
 
 // static
-void MultiprofilesIntroView::ShowDialog(
+void TeleportWarningView::ShowDialog(
     const base::Callback<void(bool)> on_accept) {
-  MultiprofilesIntroView* dialog_view =
-      new MultiprofilesIntroView(on_accept);
+  TeleportWarningView* dialog_view =
+      new TeleportWarningView(on_accept);
   views::DialogDelegate::CreateDialogWidget(
       dialog_view, ash::Shell::GetTargetRootWindow(), NULL);
   dialog_view->InitDialog();
@@ -78,20 +80,20 @@ void MultiprofilesIntroView::ShowDialog(
   widget->Show();
 }
 
-bool MultiprofilesIntroView::Accept() {
+bool TeleportWarningView::Accept() {
   on_accept_.Run(no_show_checkbox_->checked());
   return true;
 }
 
-ui::ModalType MultiprofilesIntroView::GetModalType() const {
+ui::ModalType TeleportWarningView::GetModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
-gfx::Size MultiprofilesIntroView::GetPreferredSize() {
+gfx::Size TeleportWarningView::GetPreferredSize() {
   return gfx::Size(kDefaultWidth, kDefaultHeight);
 }
 
-void MultiprofilesIntroView::InitDialog() {
+void TeleportWarningView::InitDialog() {
   const gfx::Insets kDialogInsets(kTopInset, kInset, kInset, kInset);
 
   // Create the views and layout manager and set them up.
@@ -102,8 +104,9 @@ void MultiprofilesIntroView::InitDialog() {
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
 
+  // Title
   views::Label* title_label_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_HEADLINE));
+      l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_TITLE));
   title_label_->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::MediumBoldFont));
   title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
@@ -111,9 +114,9 @@ void MultiprofilesIntroView::InitDialog() {
   grid_layout->AddView(title_label_);
   grid_layout->AddPaddingRow(0, kPaddingToMessage);
 
-  // Explanation string.
+  // Explanation string
   views::Label* label = new views::Label(
-      l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_MESSAGE));
+      l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_MESSAGE));
   label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::MediumFont));
   label->SetMultiLine(true);
@@ -122,10 +125,10 @@ void MultiprofilesIntroView::InitDialog() {
   grid_layout->StartRow(0, 0);
   grid_layout->AddView(label);
 
-  // Next explanation string.
+  // Next explanation string
   grid_layout->AddPaddingRow(0, kPaddingToMessage);
   views::Label* lower_label = new views::Label(
-      l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_EXPLANATION));
+      l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_EXPLANATION));
   lower_label->SetFontList(ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::MediumFont));
   lower_label->SetMultiLine(true);
@@ -134,15 +137,14 @@ void MultiprofilesIntroView::InitDialog() {
   grid_layout->StartRow(0, 0);
   grid_layout->AddView(lower_label);
 
-  // No-show again checkbox.
+  // No-show again checkbox
   grid_layout->AddPaddingRow(0, kPaddingToCheckBox);
   no_show_checkbox_.reset(new views::Checkbox(
-      l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_NOSHOW_AGAIN)));
+      l10n_util::GetStringUTF16(IDS_VISIT_DESKTOP_WARNING_SHOW_DISMISS)));
   no_show_checkbox_->SetChecked(true);
   no_show_checkbox_->SetFontList(
       ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::MediumFont));
-  no_show_checkbox_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   grid_layout->StartRow(0, 0);
   grid_layout->AddView(no_show_checkbox_.get());
 
@@ -155,8 +157,9 @@ void MultiprofilesIntroView::InitDialog() {
 ////////////////////////////////////////////////////////////////////////////////
 // Factory function.
 
-void ShowMultiprofilesIntroDialog(const base::Callback<void(bool)> on_accept) {
-  MultiprofilesIntroView::ShowDialog(on_accept);
+void ShowMultiprofilesWarningDialog(
+   const base::Callback<void(bool)> on_accept) {
+  TeleportWarningView::ShowDialog(on_accept);
 }
 
 }  // namespace chromeos