diff options
| author | pastarmovj@google.com <pastarmovj@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 08:47:37 +0000 |
|---|---|---|
| committer | pastarmovj@google.com <pastarmovj@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-03 08:47:37 +0000 |
| commit | ef98357d1b943259f51f3b0fb9b986490d783437 (patch) | |
| tree | d87a6d05b622e030f8565cd527d563025df27b1e | |
| parent | b36d01c6e03846e65306f890764f11ee7a3477b5 (diff) | |
| download | chromium_src-ef98357d1b943259f51f3b0fb9b986490d783437.zip chromium_src-ef98357d1b943259f51f3b0fb9b986490d783437.tar.gz chromium_src-ef98357d1b943259f51f3b0fb9b986490d783437.tar.bz2 | |
Merge 208694 "Re-enable restarting chrome when the user has set ..."
> Re-enable restarting chrome when the user has set flags.
>
> The referenced issues have been fixed.
>
> BUG=221352
> R=nkostylev@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/17679003
TBR=pastarmovj@chromium.org
Review URL: https://codereview.chromium.org/18592005
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@209929 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/login_utils.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 3860528..54da6ba 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -251,13 +251,12 @@ void LoginUtilsImpl::DoBrowserLaunch(Profile* profile, return; } -#if 0 - // Temporary disable until all regressions introduced are fixed. - // See crbug.com/252442, crbug.com/251261, crbug.com/251253 CommandLine user_flags(CommandLine::NO_PROGRAM); about_flags::PrefServiceFlagsStorage flags_storage_(profile->GetPrefs()); about_flags::ConvertFlagsToSwitches(&flags_storage_, &user_flags); - if (!about_flags::AreSwitchesIdenticalToCurrentCommandLine( + // Only restart if needed and if not going into managed mode. + if (!UserManager::Get()->IsLoggedInAsLocallyManagedUser() && + !about_flags::AreSwitchesIdenticalToCurrentCommandLine( user_flags, *CommandLine::ForCurrentProcess())) { CommandLine::StringVector flags; // argv[0] is the program name |CommandLine::NO_PROGRAM|. @@ -268,7 +267,6 @@ void LoginUtilsImpl::DoBrowserLaunch(Profile* profile, chrome::ExitCleanly(); return; } -#endif if (login_host) { login_host->SetStatusAreaVisible(true); |