Show only the settings pages for new managed users

chrome/browser/ui/startup/startup_browser_creator_impl.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/startup/startup_browser_creator_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "apps/app_restore_service.h"
@@ skipping 741 matching lines @@
     // Only use the set of urls specified in preferences if nothing was
     // specified on the command line. Filter out any urls that are to be
     // restored by virtue of having been previously pinned.
     AddUniqueURLs(pref.urls, &tabs);
   } else if (pref.type == SessionStartupPref::HOMEPAGE) {
     // If 'homepage' selected, either by the user or by a policy, we should
     // have migrated them to another value.
     NOTREACHED() << "SessionStartupPref has deprecated type HOMEPAGE";
   }
 
+  PrefService* prefs = profile_->GetPrefs();
   if (pref.type != SessionStartupPref::LAST &&
-      SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_)) {
+      SyncPromoUI::ShouldShowSyncPromoAtStartup(profile_, is_first_run_) &&

[Bernhard Bauer, 2013/04/03 16:41:23]

This method is supposed to tell a caller whether the sync promo should be shown.
If we don't want to show the sync promo for a managed profile, why don't we move
the check there?

[Sergiu, 2013/04/03 17:45:54]

Makes total sense, moved it to sync_promo_ui.cc.

+      !prefs->GetBoolean(prefs::kProfileIsManaged)) {
     AddSyncPromoTab(profile_, &tabs);
   }
 
   if (tabs.empty())
     return NULL;
 
   Browser* browser = OpenTabsInBrowser(NULL, true, tabs);
   return browser;
 }
 
@@ skipping 144 matching lines @@
         chrome::ShowDefaultBrowserPrompt(profile_,
                                          browser->host_desktop_type());
       }
     }
   }
 }
 
 
 void StartupBrowserCreatorImpl::AddStartupURLs(
     std::vector<GURL>* startup_urls) const {
+  PrefService* prefs = profile_->GetPrefs();
+  bool has_reset_local_passphrase_switch =
+      command_line_.HasSwitch(switches::kResetLocalPassphrase);
+  if ((is_first_run_ || has_reset_local_passphrase_switch) &&
+      prefs->GetBoolean(prefs::kProfileIsManaged)) {
+    startup_urls->insert(startup_urls->begin(),
+                         GURL(std::string(chrome::kChromeUISettingsURL) +
+                              chrome::kManagedUserSettingsSubPage));
+    if (has_reset_local_passphrase_switch) {
+      prefs->SetString(prefs::kManagedModeLocalPassphrase, "");
+      prefs->SetString(prefs::kManagedModeLocalSalt, "");
+    } else {
+      // If this is the first run then show only the managed user settings

[Bernhard Bauer, 2013/04/03 16:41:23]

Wait, is this actually necessary? If we have set a startup URL, none of the
branches below should execute (because they check for empty |startup_urls|). We
also have a test now (thanks!) to prevent regressions if someone inadvertently
modifies the code.

[Sergiu, 2013/04/03 17:45:54]

That is true, we can do without the else branch. Removed.

+      // page.
+      return;
+    }
+  }
+
   // If we have urls specified by the first run master preferences use them
   // and nothing else.
   if (browser_creator_ && startup_urls->empty()) {
     if (!browser_creator_->first_run_tabs_.empty()) {
       std::vector<GURL>::iterator it =
           browser_creator_->first_run_tabs_.begin();
       while (it != browser_creator_->first_run_tabs_.end()) {
         // Replace magic names for the actual urls.
         if (it->host() == "new_tab_page") {
           startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
         } else if (it->host() == "welcome_page") {
           startup_urls->push_back(internals::GetWelcomePageURL());
         } else {
           startup_urls->push_back(*it);
         }
         ++it;
       }
       browser_creator_->first_run_tabs_.clear();
     }
   }
 
   // Otherwise open at least the new tab page (and the welcome page, if this
   // is the first time the browser is being started), or the set of URLs
   // specified on the command line.
   if (startup_urls->empty()) {
     startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
     if (first_run::ShouldShowWelcomePage())
       startup_urls->push_back(internals::GetWelcomePageURL());
   }
-
-  PrefService* prefs = profile_->GetPrefs();
-  bool has_reset_local_passphrase_switch =
-      command_line_.HasSwitch(switches::kResetLocalPassphrase);
-  if ((is_first_run_ || has_reset_local_passphrase_switch) &&
-      prefs->GetBoolean(prefs::kProfileIsManaged)) {
-    startup_urls->insert(startup_urls->begin(),
-                         GURL(std::string(chrome::kChromeUISettingsURL) +
-                              chrome::kManagedUserSettingsSubPage));
-    if (has_reset_local_passphrase_switch) {
-      prefs->SetString(prefs::kManagedModeLocalPassphrase, "");
-      prefs->SetString(prefs::kManagedModeLocalSalt, "");
-    }
-  }
 }
 
 #if !defined(OS_WIN) || defined(USE_AURA)
 // static
 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
     Profile* profile,
     const std::vector<GURL>& startup_urls) {
   return false;
 }
 #endif