Created optional multiprofiles introduction dialog.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 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/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 47 matching lines @@
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/browser/drive/drive_service_interface.h"
 #include "chrome/browser/feedback/tracing_manager.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
@@ skipping 153 matching lines @@
 void ShowNetworkSettingsPage(const std::string& service_path) {
   std::string page = chrome::kInternetOptionsSubPage;
   page += "?servicePath=" + net::EscapeUrlEncodedData(service_path, true);
   content::RecordAction(
       base::UserMetricsAction("OpenInternetOptionsDialog"));
   ShowSettingsSubPageForAppropriateBrowser(
       page,
       ProfileManager::GetPrimaryUserProfile());
 }
 
+void onAcceptMultiprofilesIntro(bool no_show_again) {

[Nikita (slow), 2014/01/14 13:44:11]

nit: Capitalize.

[merkulova, 2014/01/14 14:29:34]

Done.

+  PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
+  prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
+  UserAddingScreen::Get()->Start();
+}
+
 class SystemTrayDelegate : public ash::SystemTrayDelegate,
                            public SessionManagerClient::Observer,
                            public drive::JobListObserver,
                            public content::NotificationObserver,
                            public input_method::InputMethodManager::Observer,
                            public chromeos::LoginState::Observer,
                            public device::BluetoothAdapter::Observer,
                            public SystemKeyEventListener::CapsLockObserver,
                            public policy::CloudPolicyStore::Observer,
                            public ash::SessionStateObserver {
@@ skipping 371 matching lines @@
     if (UserManager::Get()->GetActiveUser()->GetType() !=
             User::USER_TYPE_REGULAR) {
       return;
     }
 
     if (static_cast<int>(UserManager::Get()->GetLoggedInUsers().size()) >=
             shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers())
       return;
 
     // Launch sign in screen to add another user to current session.
-    if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size())
-      UserAddingScreen::Get()->Start();
+    if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size()) {
+      bool show_intro = !ProfileManager::GetActiveUserProfile()->
+          GetPrefs()->GetBoolean(prefs::kMultiProfileNeverShowIntro);
+      base::Callback<void(bool)> on_accept = base::Bind(

[Nikita (slow), 2014/01/14 13:44:11]

nit: Move base::Bind( to next line so that whole call fits on one line.

[merkulova, 2014/01/14 14:29:34]

Done.

+          &onAcceptMultiprofilesIntro);
+      if (show_intro)
+        ShowMultiprofilesIntroDialog(on_accept);
+      else
+        UserAddingScreen::Get()->Start();
+    }
   }
 
   virtual void ShowSpringChargerReplacementDialog() OVERRIDE {
     if (!ChargerReplacementDialog::ShouldShowDialog())
       return;
 
     ChargerReplacementDialog* dialog =
         new ChargerReplacementDialog(GetNativeWindow());
     dialog->Show();
   }
@@ skipping 654 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos