Start in elevated mode when creating a new managed user profile.

BUG=222364
TEST=browser_tests


Review URL: https://chromiumcodereview.appspot.com/13778004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193433 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/managed_mode/managed_user_service.cc

@@ -104,7 +104,8 @@ void ManagedUserService::URLFilterContext::SetManualURLs(
                  io_url_filter_, base::Owned(url_map.release())));
 }
 
-ManagedUserService::ManagedUserService(Profile* profile) : profile_(profile) {
+ManagedUserService::ManagedUserService(Profile* profile)
+    : profile_(profile), startup_elevation_(false) {
 }
 
 ManagedUserService::~ManagedUserService() {

chrome/browser/managed_mode/managed_user_service.h

@@ -106,6 +106,14 @@ class ManagedUserService : public ProfileKeyedService,
   // managed.
   void Init();
 
+  void set_startup_elevation(bool elevation) {
+    startup_elevation_ = elevation;
+  }
+
+  bool startup_elevation() const {
+    return startup_elevation_;
+  }
+
   // extensions::ManagementPolicy::Provider implementation:
   virtual std::string GetDebugPolicyProviderName() const OVERRIDE;
   virtual bool UserMayLoad(const extensions::Extension* extension,
@@ -179,6 +187,9 @@ class ManagedUserService : public ProfileKeyedService,
   // Owns us via the ProfileKeyedService mechanism.
   Profile* profile_;
 
+  // Is true if the managed user should start in elevated mode.
+  bool startup_elevation_;
+
   content::NotificationRegistrar registrar_;
   PrefChangeRegistrar pref_change_registrar_;
 

chrome/browser/resources/options/managed_user_settings.js

@@ -108,7 +108,6 @@ cr.define('options', function() {
       }
       if (!$('use-passphrase-checkbox').checked)
         chrome.send('resetPassphrase');
-      chrome.send('confirmManagedUserSettings');
       SettingsDialog.prototype.handleConfirm.call(this);
     },
 
@@ -161,6 +160,7 @@ cr.define('options', function() {
       // Reset the authentication of the custodian.
       this.authenticationState = ManagedUserAuthentication.UNAUTHENTICATED;
       chrome.send('setElevated', [false]);
+      chrome.send('confirmManagedUserSettings');
     },
   };
 

chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -35,6 +35,10 @@
 #include "content/public/browser/web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
+#endif
+
 using extensions::Extension;
 
 namespace {
@@ -903,6 +907,7 @@ class ManagedModeBrowserCreatorTest : public InProcessBrowserTest {
   }
 };
 
+#if defined(ENABLE_MANAGED_USERS)
 IN_PROC_BROWSER_TEST_F(ManagedModeBrowserCreatorTest,
                        StartupManagedModeProfile) {
   // Make this a managed profile.
@@ -913,6 +918,9 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBrowserCreatorTest,
   CommandLine dummy(CommandLine::NO_PROGRAM);
   StartupBrowserCreatorImpl launch(base::FilePath(), dummy, &browser_creator,
                                    chrome::startup::IS_FIRST_RUN);
+  content::WindowedNotificationObserver observer(
+      content::NOTIFICATION_LOAD_STOP,
+      content::NotificationService::AllSources());
   ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false));
 
   // This should have created a new browser window.
@@ -928,6 +936,14 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBrowserCreatorTest,
   GURL expected(GURL(std::string(chrome::kChromeUISettingsURL) +
                      chrome::kManagedUserSettingsSubPage));
   EXPECT_EQ(GURL(expected), web_contents->GetURL());
+  observer.Wait();
+
+  // Managed user should be in elevated state.
+  bool is_elevated = ManagedModeNavigationObserver::FromWebContents(
+      web_contents)->is_elevated();
+  EXPECT_TRUE(is_elevated);
 }
 
+#endif  // ENABLE_MANAGED_USERS
+
 #endif  // !OS_CHROMEOS

chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -106,6 +106,11 @@
 #include "base/win/windows_version.h"
 #endif
 
+#if defined(ENABLE_MANAGED_USERS)
+#include "chrome/browser/managed_mode/managed_user_service.h"
+#include "chrome/browser/managed_mode/managed_user_service_factory.h"
+#endif
+
 using content::ChildProcessSecurityPolicy;
 using content::WebContents;
 using extensions::Extension;
@@ -924,6 +929,7 @@ void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(
 
 void StartupBrowserCreatorImpl::AddStartupURLs(
     std::vector<GURL>* startup_urls) const {
+#if defined(ENABLE_MANAGED_USERS)
   PrefService* prefs = profile_->GetPrefs();
   bool has_reset_local_passphrase_switch =
       command_line_.HasSwitch(switches::kResetLocalPassphrase);
@@ -932,11 +938,15 @@ void StartupBrowserCreatorImpl::AddStartupURLs(
     startup_urls->insert(startup_urls->begin(),
                          GURL(std::string(chrome::kChromeUISettingsURL) +
                               chrome::kManagedUserSettingsSubPage));
+    ManagedUserService* service = ManagedUserServiceFactory::GetForProfile(
+        profile_);
+    service->set_startup_elevation(true);
     if (has_reset_local_passphrase_switch) {
       prefs->SetString(prefs::kManagedModeLocalPassphrase, std::string());
       prefs->SetString(prefs::kManagedModeLocalSalt, std::string());
     }
   }
+#endif
 
   // If we have urls specified by the first run master preferences use them
   // and nothing else.

chrome/browser/ui/webui/options/managed_user_settings_handler.cc

@@ -13,7 +13,6 @@
 #include "base/prefs/pref_service.h"
 #include "base/time.h"
 #include "base/values.h"
-#include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
@@ -92,7 +91,8 @@ void AddCurrentURLEntries(content::WebUI* web_ui, ListValue* entries) {
 
 namespace options {
 
-ManagedUserSettingsHandler::ManagedUserSettingsHandler() {
+ManagedUserSettingsHandler::ManagedUserSettingsHandler()
+    : has_seen_settings_dialog_(false) {
 }
 
 ManagedUserSettingsHandler::~ManagedUserSettingsHandler() {
@@ -111,19 +111,14 @@ void ManagedUserSettingsHandler::InitializePage() {
       switches::kEnableManagedUsers)) {
     return;
   }
+
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  base::FundamentalValue is_passphrase_set(!pref_service->GetString(
-      prefs::kManagedModeLocalPassphrase).empty());
+  bool passphrase_empty =
+      pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty();
+  base::FundamentalValue is_passphrase_set(!passphrase_empty);
   web_ui()->CallJavascriptFunction(
       "ManagedUserSettings.passphraseChanged",
       is_passphrase_set);
-  if ((first_run::IsChromeFirstRun() &&
-       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoFirstRun)) ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kResetLocalPassphrase)) {
-    ManagedModeNavigationObserver::FromWebContents(
-        web_ui()->GetWebContents())->set_elevated(true);
-  }
 
   // Populate the list.
   UpdateViewFromModel();
@@ -132,8 +127,21 @@ void ManagedUserSettingsHandler::InitializePage() {
 void ManagedUserSettingsHandler::HandlePageOpened(const base::ListValue* args) {
   start_time_ = base::TimeTicks::Now();
   content::RecordAction(UserMetricsAction("ManagedMode_OpenSettings"));
-  if (ManagedModeNavigationObserver::FromWebContents(
-      web_ui()->GetWebContents())->is_elevated()) {
+  ManagedUserService* service = ManagedUserServiceFactory::GetForProfile(
+      Profile::FromWebUI(web_ui()));
+  ManagedModeNavigationObserver* observer =
+      ManagedModeNavigationObserver::FromWebContents(
+          web_ui()->GetWebContents());
+
+  // Check if we need to give initial elevation for startup of a new profile.
+  if (service->startup_elevation()) {
+    service->set_startup_elevation(false);
+    observer->set_elevated(true);
+  } else {
+    has_seen_settings_dialog_ = true;
+  }
+
+  if (observer->is_elevated()) {
     web_ui()->CallJavascriptFunction("ManagedUserSettings.isAuthenticated",
                                      base::FundamentalValue(true));
   }
@@ -207,7 +215,8 @@ void ManagedUserSettingsHandler::RegisterMessages() {
 }
 
 void ManagedUserSettingsHandler::SaveMetrics(const ListValue* args) {
-  if (first_run::IsChromeFirstRun()) {
+  if (!has_seen_settings_dialog_) {
+    has_seen_settings_dialog_ = true;
     UMA_HISTOGRAM_LONG_TIMES("ManagedMode.UserSettingsFirstRunTime",
                              base::TimeTicks::Now() - start_time_);
   } else {

chrome/browser/ui/webui/options/managed_user_settings_handler.h

@@ -58,6 +58,10 @@ class ManagedUserSettingsHandler : public OptionsPageUIHandler {
   // service and updating the WebUI model.
   void UpdateViewFromModel();
 
+  // Stores if the user has already seen the managed user settings dialog. Is
+  // set to true when the page is opened, and the page had been opened before.
+  bool has_seen_settings_dialog_;
+
   // For tracking how long the user spends on this page.
   base::TimeTicks start_time_;