Adding policy support to the new network configuration stack.

chrome/browser/chromeos/login/login_utils.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/chromeos/login/login_utils.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/chromeos/chromeos_version.h"
@@ skipping 56 matching lines @@
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/network_change_notifier.h"
@@ skipping 37 matching lines @@
         should_restore_auth_session_(false),
         session_restore_strategy_(
             OAuthLoginManager::RESTORE_FROM_SAVED_OAUTH2_REFRESH_TOKEN),
         url_request_context_getter_(NULL) {
     net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
     // During tests, the browser_process may not be initialized yet causing
     // this to fail.
     // TODO(dzhioev): Disabled in tests for a while.
     // TODO(dzhioev): Move prewarm out of LoginUtils.
     if (g_browser_process &&
-        !CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) {
+        !CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType)) {
       registrar_.Add(
           this,
           chrome::NOTIFICATION_PROFILE_URL_REQUEST_CONTEXT_GETTER_INITIALIZED,
           content::Source<Profile>(ProfileHelper::GetSigninProfile()));
     }
   }
 
   virtual ~LoginUtilsImpl() {
     net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
   }
@@ skipping 285 matching lines @@
         UserManager::Get()->GetLoggedInUser()->display_email());
   }
 
   // Make sure we flip every profile to not share proxies if the user hasn't
   // specified so explicitly.
   const PrefService::Preference* use_shared_proxies_pref =
       user_profile->GetPrefs()->FindPreference(prefs::kUseSharedProxies);
   if (use_shared_proxies_pref->IsDefaultValue())
     user_profile->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false);
 
-  // Locally managed users do not have user policy initialized.
-  if (!UserManager::Get()->IsLoggedInAsLocallyManagedUser()) {
-    policy::NetworkConfigurationUpdater* network_configuration_updater =
-        g_browser_process->browser_policy_connector()->
-        GetNetworkConfigurationUpdater();
-    if (network_configuration_updater)
-      network_configuration_updater->OnUserPolicyInitialized();
-  }
+  // Notify the network configuration updater that policies are initialized. If
+  // there is no policy, it will read an empty policy which is fine.
+  g_browser_process->browser_policy_connector()->
+      GetNetworkConfigurationUpdater()->OnUserPolicyInitialized();
 
   RespectLocalePreference(user_profile);
 }
 
 void LoginUtilsImpl::InitSessionRestoreStrategy() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   bool in_app_mode = chrome::IsRunningInForcedAppMode();
 
   // Are we in kiosk app mode?
   if (in_app_mode) {
@@ skipping 503 matching lines @@
 bool LoginUtils::IsWhitelisted(const std::string& username) {
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(kAccountsPrefUsers, username);
 }
 
 }  // namespace chromeos