No Goodies for Supervised Users

chrome/browser/chromeos/first_run/goodies_displayer.cc

 // Copyright 2015 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/chromeos/first_run/goodies_displayer.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
+#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 namespace first_run {
 
 namespace {
 
 GoodiesDisplayer* g_goodies_displayer = nullptr;
 GoodiesDisplayerTestInfo* g_test_info = nullptr;
 
@@ skipping 68 matching lines @@
 // static
 void GoodiesDisplayer::Delete() {
   delete g_goodies_displayer;
   g_goodies_displayer = nullptr;
 }
 
 // If conditions enumerated below are met, this loads the Oobe Goodies page for
 // new Chromebooks; when appropriate, it uses pref to mark page as shown,
 // removes itself from BrowserListObservers, and deletes itself.
 void GoodiesDisplayer::OnBrowserSetLastActive(Browser* browser) {
-  // 1. Must be an actual tabbed brower window.
+  // 1. Must be an actual tabbed browser window.
   if (browser->type() != Browser::TYPE_TABBED)
     return;
 
-  // 2. Not guest or incognito session (keep observing).
-  if (browser->profile()->IsOffTheRecord())
+  // 2. Not guest or incognito session or supervised user (keep observing).
+  user_manager::User* user = user_manager::UserManager::Get()->GetActiveUser();
+  if (browser->profile()->IsOffTheRecord() || (user && user->IsSupervised()))
     return;
 
   PrefService* local_state = g_browser_process->local_state();
   // 3. Not previously shown, or otherwise marked as unavailable.
   if (local_state->GetBoolean(prefs::kCanShowOobeGoodiesPage)) {
     // 4. Device not enterprise enrolled.
     const bool enterprise_managed = g_browser_process->platform_part()
                                         ->browser_policy_connector_chromeos()
                                         ->IsEnterpriseManaged();
     // 5. --no-first-run not specified, as it is for tests. --force-run takes
@@ skipping 14 matching lines @@
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::Bind(&Delete));
 }
 
 GoodiesDisplayerTestInfo::GoodiesDisplayerTestInfo()
     : days_since_oobe(0), setup_complete(false) {}
 
 GoodiesDisplayerTestInfo::~GoodiesDisplayerTestInfo() {}
 
 }  // namespace first_run
 }  // namespace chromeos