Commit ed4ad57d authored by dzhioev@chromium.org's avatar dzhioev@chromium.org

Removed "disable-first-run-ui" flag and switch.

BUG=361083
TEST=manually

Review URL: https://codereview.chromium.org/289693002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272357 0039d316-1c4b-4281-b951-d872f2087c98
parent b6f34fbe
...@@ -6276,12 +6276,6 @@ Keep your key file in a safe place. You will need it to create new versions of y ...@@ -6276,12 +6276,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
</if> </if>
<if expr="chromeos"> <if expr="chromeos">
<message name="IDS_FLAGS_DISABLE_FIRST_RUN_UI_NAME" desc="Name of the flag to disable new first-run UI.">
Disable new first-run UI.
</message>
<message name="IDS_FLAGS_DISABLE_FIRST_RUN_UI_DESCRIPTION" desc="Description for the flag to disable new first-run UI.">
If disabled, overlay tutorial won't be shown after first sign-in.
</message>
<message name="IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME" desc="Name of the flag to enable animated transitions for the first-run tutorial."> <message name="IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME" desc="Name of the flag to enable animated transitions for the first-run tutorial.">
Enable animated transitions in the first-run tutorial. Enable animated transitions in the first-run tutorial.
</message> </message>
......
...@@ -1508,13 +1508,6 @@ const Experiment kExperiments[] = { ...@@ -1508,13 +1508,6 @@ const Experiment kExperiments[] = {
MULTI_VALUE_TYPE(kZeroCopyChoices) MULTI_VALUE_TYPE(kZeroCopyChoices)
}, },
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
{
"disable-first-run-ui",
IDS_FLAGS_DISABLE_FIRST_RUN_UI_NAME,
IDS_FLAGS_DISABLE_FIRST_RUN_UI_DESCRIPTION,
kOsCrOS,
SINGLE_VALUE_TYPE(chromeos::switches::kDisableFirstRunUI)
},
{ {
"enable-first-run-ui-transitions", "enable-first-run-ui-transitions",
IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME,
......
...@@ -65,13 +65,11 @@ class DialogLauncher : public content::NotificationObserver { ...@@ -65,13 +65,11 @@ class DialogLauncher : public content::NotificationObserver {
bool launched_in_test = command_line->HasSwitch(::switches::kTestType); bool launched_in_test = command_line->HasSwitch(::switches::kTestType);
bool launched_in_telemetry = bool launched_in_telemetry =
command_line->HasSwitch(switches::kOobeSkipPostLogin); command_line->HasSwitch(switches::kOobeSkipPostLogin);
bool first_run_disabled =
command_line->HasSwitch(switches::kDisableFirstRunUI);
bool is_user_new = chromeos::UserManager::Get()->IsCurrentUserNew(); bool is_user_new = chromeos::UserManager::Get()->IsCurrentUserNew();
bool first_run_forced = command_line->HasSwitch(switches::kForceFirstRunUI); bool first_run_forced = command_line->HasSwitch(switches::kForceFirstRunUI);
bool first_run_seen = bool first_run_seen =
profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown); profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown);
if (!launched_in_telemetry && !first_run_disabled && if (!launched_in_telemetry &&
((is_user_new && !first_run_seen && !launched_in_test) || ((is_user_new && !first_run_seen && !launched_in_test) ||
first_run_forced)) { first_run_forced)) {
LaunchDialogForProfile(profile_); LaunchDialogForProfile(profile_);
......
...@@ -519,10 +519,8 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( ...@@ -519,10 +519,8 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager"))); base::FilePath(FILE_PATH_LITERAL("chromeos/wallpaper_manager")));
} }
if (!command_line->HasSwitch(chromeos::switches::kDisableFirstRunUI)) { Add(IDR_FIRST_RUN_DIALOG_MANIFEST,
Add(IDR_FIRST_RUN_DIALOG_MANIFEST, base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app")));
base::FilePath(FILE_PATH_LITERAL("chromeos/first_run/app")));
}
Add(IDR_NETWORK_CONFIGURATION_MANIFEST, Add(IDR_NETWORK_CONFIGURATION_MANIFEST,
base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration"))); base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration")));
......
...@@ -199,9 +199,6 @@ const char kStubCrosSettings[] = "stub-cros-settings"; ...@@ -199,9 +199,6 @@ const char kStubCrosSettings[] = "stub-cros-settings";
// Disables SAML sigin support. // Disables SAML sigin support.
const char kDisableSamlSignin[] = "disable-saml-signin"; const char kDisableSamlSignin[] = "disable-saml-signin";
// Disables new first-run overlay UI.
const char kDisableFirstRunUI[] = "disable-first-run-ui";
// Enables animated transitions during first-run tutorial. // Enables animated transitions during first-run tutorial.
const char kEnableFirstRunUITransitions[] = "enable-first-run-ui-transitions"; const char kEnableFirstRunUITransitions[] = "enable-first-run-ui-transitions";
......
...@@ -69,7 +69,6 @@ CHROMEOS_EXPORT extern const char kPowerStub[]; ...@@ -69,7 +69,6 @@ CHROMEOS_EXPORT extern const char kPowerStub[];
CHROMEOS_EXPORT extern const char kShillStub[]; CHROMEOS_EXPORT extern const char kShillStub[];
CHROMEOS_EXPORT extern const char kSmsTestMessages[]; CHROMEOS_EXPORT extern const char kSmsTestMessages[];
CHROMEOS_EXPORT extern const char kStubCrosSettings[]; CHROMEOS_EXPORT extern const char kStubCrosSettings[];
CHROMEOS_EXPORT extern const char kDisableFirstRunUI[];
CHROMEOS_EXPORT extern const char kForceFirstRunUI[]; CHROMEOS_EXPORT extern const char kForceFirstRunUI[];
CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[];
CHROMEOS_EXPORT extern const char kDisableSamlSignin[]; CHROMEOS_EXPORT extern const char kDisableSamlSignin[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment