Index: chrome/browser/ui/webui/options/managed_user_settings_handler.cc |
diff --git a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc b/chrome/browser/ui/webui/options/managed_user_settings_handler.cc |
index c4055829f77f9af35480bb35def68177dcdf8480..64bb7884ff99820757153040a7e8518775b4dde0 100644 |
--- a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc |
+++ b/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" |
@@ -112,18 +111,12 @@ void ManagedUserSettingsHandler::InitializePage() { |
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(); |
@@ -206,8 +199,15 @@ void ManagedUserSettingsHandler::RegisterMessages() { |
base::Unretained(this))); |
} |
+bool ManagedUserSettingsHandler::HasSeenSetupDialog() { |
+ PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); |
+ return pref_service->GetBoolean(prefs::kManagedModeHasSeenSetupDialog); |
+} |
+ |
void ManagedUserSettingsHandler::SaveMetrics(const ListValue* args) { |
- if (first_run::IsChromeFirstRun()) { |
+ if (!HasSeenSetupDialog()) { |
+ PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); |
+ pref_service->SetBoolean(prefs::kManagedModeHasSeenSetupDialog, true); |
UMA_HISTOGRAM_LONG_TIMES("ManagedMode.UserSettingsFirstRunTime", |
base::TimeTicks::Now() - start_time_); |
} else { |