Created optional multiprofiles introduction dialog.

chrome/browser/chromeos/profiles/multiprofiles_intro_view.cc

Index: chrome/browser/chromeos/profiles/multiprofiles_intro_view.cc
diff --git a/chrome/browser/chromeos/profiles/multiprofiles_intro_view.cc b/chrome/browser/chromeos/profiles/multiprofiles_intro_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7d06a18cadeda29d7bd342256741e4c719e662ac
--- /dev/null
+++ b/chrome/browser/chromeos/profiles/multiprofiles_intro_view.cc
@@ -0,0 +1,170 @@
+// Copyright (c) 2013 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/profiles/multiprofiles_intro_view.h"
+
+#include "base/prefs/pref_service.h"
+#include "chrome/browser/chromeos/login/login_display_host_impl.h"
+#include "chrome/browser/chromeos/login/user_adding_screen.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/pref_names.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/button/checkbox.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/layout/grid_layout.h"
+#include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_delegate.h"
+
+namespace chromeos {
+
+namespace {
+
+gfx::NativeWindow GetDialogParent() {
+  if (chromeos::LoginDisplayHostImpl::default_host()) {
+    return chromeos::LoginDisplayHostImpl::default_host()->GetNativeWindow();
+  } else {
+    Browser* browser = chrome::FindTabbedBrowser(
+        ProfileManager::GetDefaultProfileOrOffTheRecord(),
+        true,
+        chrome::HOST_DESKTOP_TYPE_ASH);
+    if (browser)
+      return browser->window()->GetNativeWindow();
+  }
+  return NULL;
+}
+
+// Default width/height of the dialog.
+const int kDefaultWidth = 600;
+const int kDefaultHeight = 250;
+
+const int kPaddingToMessage = 30;
+const int kPaddingToCheckBox = 50;
+
+////////////////////////////////////////////////////////////////////////////////
+// Dialog for multi-profiles introduction.
+class MultiprofilesIntroView : public views::DialogDelegateView {
+ public:
+  MultiprofilesIntroView();
+  virtual ~MultiprofilesIntroView();
+
+  static void ShowDialog(gfx::NativeWindow owning_window);
+
+  virtual bool Accept() OVERRIDE;
+
+  // views::WidgetDelegate overrides
+  virtual ui::ModalType GetModalType() const OVERRIDE;
+  virtual base::string16 GetWindowTitle() const OVERRIDE;
+
+  // views::View overrides
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+
+ private:
+  void InitDialog();
+
+  scoped_ptr<views::Checkbox> no_show_checkbox_;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// MultiprofilesIntroView implementation.
+
+MultiprofilesIntroView::MultiprofilesIntroView() {
+}
+
+MultiprofilesIntroView::~MultiprofilesIntroView() {
+}
+
+// static
+void MultiprofilesIntroView::ShowDialog(gfx::NativeWindow owning_window) {
+  MultiprofilesIntroView* dialog_view =
+      new MultiprofilesIntroView();
+  views::DialogDelegate::CreateDialogWidget(dialog_view, NULL, owning_window);

[dzhioev (left Google), 2013/12/20 03:39:01]

I think your choice of owning_window is not right. It's probably should be one
of RootWindows, ideally RootWindow where user clicked on systray, by primary
RootWindow will be OK too. Also, as I can understand, it should be passed as
|context| parameter of CreateDialogWidget, not |parent|.

[merkulova, 2014/01/10 15:16:52]

Done.

+  dialog_view->InitDialog();
+  views::Widget* widget = dialog_view->GetWidget();
+  DCHECK(widget);
+  widget->Show();
+}
+
+bool MultiprofilesIntroView::Accept() {
+  PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
+  prefs->SetBoolean(prefs::kMultiProfileIntroShowDismissed,
+                     no_show_checkbox_->checked());

[dzhioev (left Google), 2013/12/20 03:39:01]

nit: fix indent

[merkulova, 2014/01/10 15:16:52]

Done.

+  UserAddingScreen::Get()->Start();
+  return true;
+}
+
+ui::ModalType MultiprofilesIntroView::GetModalType() const {
+  return ui::MODAL_TYPE_SYSTEM;
+}
+
+base::string16 MultiprofilesIntroView::GetWindowTitle() const {
+  return l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_HEADLINE);
+}
+
+gfx::Size MultiprofilesIntroView::GetPreferredSize() {
+  return gfx::Size(kDefaultWidth, kDefaultHeight);

[dzhioev (left Google), 2013/12/20 03:39:01]

I think default implementation of GetPreferredSize asks layout_manager about
size. Isn't it better? Why do we need fixed size here?

[merkulova, 2014/01/10 15:16:52]

As discussed offline, it's the easiest way to set sizes here. HeightFromWidth
methods don't support checkbox view.

+}
+
+void MultiprofilesIntroView::InitDialog() {
+  // Create the views and layout manager and set them up.
+  views::GridLayout* grid_layout = views::GridLayout::CreatePanel(this);
+  SetLayoutManager(grid_layout);
+  views::ColumnSet* column_set = grid_layout->AddColumnSet(0);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                        views::GridLayout::USE_PREF, 0, 0);
+
+  // Explanation string
+  views::Label* label = new views::Label(
+      l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_MESSAGE));
+  label->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(

[dzhioev (left Google), 2013/12/20 03:39:01]

Is it necessary? Isn't BaseFont set by default?
Moreover SetFont marked as OBSOLETE.

[merkulova, 2014/01/10 15:16:52]

Done.

+      ui::ResourceBundle::BaseFont));
+  label->SetMultiLine(true);
+  label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  label->SetAllowCharacterBreak(true);
+  grid_layout->StartRow(0, 0);
+  grid_layout->AddView(label);
+
+  // Next explanation string
+  grid_layout->AddPaddingRow(0, kPaddingToMessage);
+  views::Label* lower_label = new views::Label(
+      l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_EXPLANATION));
+  lower_label->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
+      ui::ResourceBundle::BaseFont));
+  lower_label->SetMultiLine(true);
+  lower_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  lower_label->SetAllowCharacterBreak(true);
+  grid_layout->StartRow(0, 0);
+  grid_layout->AddView(lower_label);
+
+  // No-show again checkbox
+  grid_layout->AddPaddingRow(0, kPaddingToCheckBox);
+  no_show_checkbox_.reset(new views::Checkbox(
+      l10n_util::GetStringUTF16(IDS_MULTIPROFILES_INTRO_NOSHOW_AGAIN)));
+  no_show_checkbox_->SetChecked(true);
+  grid_layout->StartRow(0, 0);
+  grid_layout->AddView(no_show_checkbox_.get());
+
+  grid_layout->Layout(this);

[dzhioev (left Google), 2013/12/20 03:39:01]

Is this call needed? 

[merkulova, 2014/01/10 15:16:52]

Yes, it's necessary.

Done.

+}
+
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+// Factory function.
+
+namespace multiprofiles {
+
+bool IntroDialog() {
+  gfx::NativeWindow parent = GetDialogParent();
+  MultiprofilesIntroView::ShowDialog(parent);
+  return true;

[dzhioev (left Google), 2013/12/20 03:39:01]

Why do we need return value if it is always true and never checked?

[merkulova, 2014/01/10 15:16:52]

Done.

+}
+
+}  // namespace multiprofiles
+
+}  // namespace chromeos