Index: chrome/browser/chromeos/login/startup_utils.cc |
diff --git a/chrome/browser/chromeos/login/startup_utils.cc b/chrome/browser/chromeos/login/startup_utils.cc |
index ec108c5c541c188c563152458c8a267b7ffbc3a7..c93830b725e9ac4fe72d6133f86621612984b3e1 100644 |
--- a/chrome/browser/chromeos/login/startup_utils.cc |
+++ b/chrome/browser/chromeos/login/startup_utils.cc |
@@ -15,7 +15,6 @@ |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
#include "chrome/common/chrome_paths.h" |
-#include "chrome/common/extensions/features/feature_channel.h" |
#include "chrome/common/pref_names.h" |
#include "chromeos/chromeos_switches.h" |
#include "components/web_resource/web_resource_pref_names.h" |
@@ -59,7 +58,6 @@ void StartupUtils::RegisterPrefs(PrefRegistrySimple* registry) { |
registry->RegisterIntegerPref(prefs::kDeviceRegistered, -1); |
registry->RegisterBooleanPref(prefs::kEnrollmentRecoveryRequired, false); |
registry->RegisterStringPref(prefs::kInitialLocale, "en-US"); |
- registry->RegisterBooleanPref(prefs::kNewOobe, false); |
registry->RegisterBooleanPref(prefs::kWebviewSigninDisabled, false); |
registry->RegisterBooleanPref(prefs::kNewLoginUIPopup, false); |
} |
@@ -227,15 +225,4 @@ void StartupUtils::SetInitialLocale(const std::string& locale) { |
NOTREACHED(); |
} |
-// static |
-bool StartupUtils::IsNewOobeAllowed() { |
- return extensions::GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV; |
-} |
- |
-// static |
-bool StartupUtils::IsNewOobeActivated() { |
- return g_browser_process->local_state()->GetBoolean(prefs::kNewOobe) && |
- IsNewOobeAllowed(); |
-} |
- |
} // namespace chromeos |