GetDefaultProfile fixit for Chrome OS network & power settings

chrome/browser/chromeos/power/power_prefs.cc

 // Copyright 2013 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/power/power_prefs.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 66 matching lines @@
   switch (type) {
     case chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE: {
       // Update |profile_| when entering the login screen.
       ProfileManager* profile_manager = g_browser_process->profile_manager();
       if (!profile_manager || !profile_manager->IsLoggedIn())
         SetProfile(ProfileHelper::GetSigninProfile());
       break;
     }
     case chrome::NOTIFICATION_SESSION_STARTED:
       // Update |profile_| when entering a session.
-      SetProfile(ProfileManager::GetDefaultProfile());
+      SetProfile(ProfileManager::GetPrimaryUserProfile());
       break;
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       // Update |profile_| when exiting a session or shutting down.
       Profile* profile = content::Source<Profile>(source).ptr();
       if (profile_ == profile)
         SetProfile(NULL);
       break;
     }
     default:
       NOTREACHED();
@@ skipping 124 matching lines @@
       prefs::kPowerUserActivityScreenDimDelayFactor,
       2.0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kPowerWaitForInitialUserActivity,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 void PowerPrefs::SetProfile(Profile* profile) {
+  // No need to reapply policy if profile hasn't changed, e.g. when adding a
+  // secondary user to an existing session.
+  if (profile == profile_)
+    return;
+
   profile_ = profile;
   pref_change_registrar_.reset();
 
   if (!profile) {
     power_policy_controller_->ClearPrefs();
     return;
   }
 
   base::Closure update_callback(base::Bind(
       &PowerPrefs::UpdatePowerPolicyFromPrefs,
@@ skipping 28 matching lines @@
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerUserActivityScreenDimDelayFactor,
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerWaitForInitialUserActivity,
                               update_callback);
 
   UpdatePowerPolicyFromPrefs();
 }
 
 }  // namespace chromeos