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

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

 // 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/ui/webui/options/managed_user_settings_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/url_canon.h"
 #include "grit/chromium_strings.h"
@@ skipping 58 matching lines @@
     DCHECK(result);
     entries->Append(
         GetEntryForPattern(it.key(), allow ? "allow" : "block"));
   }
 }
 
 }  // namespace
 
 namespace options {
 
-ManagedUserSettingsHandler::ManagedUserSettingsHandler() {
+ManagedUserSettingsHandler::ManagedUserSettingsHandler()
+    : has_seen_settings_dialog_(true) {
 }
 
 ManagedUserSettingsHandler::~ManagedUserSettingsHandler() {
 }
 
 void ManagedUserSettingsHandler::InitializeHandler() {
   pref_change_registrar_.Init(Profile::FromWebUI(web_ui())->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kManagedModeLocalPassphrase,
       base::Bind(&ManagedUserSettingsHandler::OnLocalPassphraseChanged,
                  base::Unretained(this)));
 }
 
 void ManagedUserSettingsHandler::InitializePage() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       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();
 }
 
 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);
+    has_seen_settings_dialog_ = false;

[Bernhard Bauer, 2013/04/10 12:26:17]

Hmm... I'm wondering if it would make more sense to initialize the value to
false, then set if to true in an else branch here. That way, we won't have a
true -> false -> true transition.

[Adrian Kuegel, 2013/04/10 12:34:55]

Yes, SGTM. I changed it like that.

+  }
+
+  if (observer->is_elevated()) {
     web_ui()->CallJavascriptFunction("ManagedUserSettings.isAuthenticated",
                                      base::FundamentalValue(true));
   }
 }
 
 void ManagedUserSettingsHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
@@ skipping 53 matching lines @@
   web_ui()->RegisterMessageCallback("setManualException",
       base::Bind(&ManagedUserSettingsHandler::SetManualException,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("checkManualExceptionValidity",
       base::Bind(
       &ManagedUserSettingsHandler::CheckManualExceptionValidity,
                  base::Unretained(this)));
 }
 
 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 {
     UMA_HISTOGRAM_LONG_TIMES("ManagedMode.UserSettingsModifyTime",
                              base::TimeTicks::Now() - start_time_);
   }
 }
 
 void ManagedUserSettingsHandler::OnLocalPassphraseChanged() {
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
@@ skipping 89 matching lines @@
 void ManagedUserSettingsHandler::UpdateViewFromModel() {
   ListValue entries;
   AddCurrentURLEntries(web_ui(), &entries);
 
   web_ui()->CallJavascriptFunction(
       "ManagedUserSettings.setManualExceptions",
       entries);
 }
 
 }  // namespace options