GetDefaultProfile fixit for Chrome OS network & power settings.

BUG=322682

Review URL: https://codereview.chromium.org/99133022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241121 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/choose_mobile_network_dialog.cc

@@ -26,7 +26,7 @@ namespace chromeos {
 // static
 void ChooseMobileNetworkDialog::ShowDialog(gfx::NativeWindow owning_window) {
   chrome::ShowWebDialog(owning_window,
-                        ProfileManager::GetDefaultProfileOrOffTheRecord(),
+                        ProfileManager::GetActiveUserProfile(),
                         new ChooseMobileNetworkDialog);
 }
 

chrome/browser/chromeos/power/peripheral_battery_observer.cc

@@ -226,8 +226,9 @@ bool PeripheralBatteryObserver::PostNotification(const std::string& address,
       UTF8ToUTF16(address),
       new PeripheralBatteryNotificationDelegate(address));
 
-  notification_manager->Add(notification,
-                            ProfileManager::GetDefaultProfileOrOffTheRecord());
+  notification_manager->Add(
+      notification,
+      ProfileManager::GetPrimaryUserProfileOrOffTheRecord());
 
   return true;
 }

chrome/browser/chromeos/power/power_prefs.cc

@@ -84,7 +84,7 @@ void PowerPrefs::Observe(int type,
     }
     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.
@@ -229,6 +229,11 @@ void PowerPrefs::RegisterProfilePrefs(
 }
 
 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();
 

chrome/browser/chromeos/sim_dialog_delegate.cc

@@ -45,7 +45,7 @@ namespace chromeos {
 void SimDialogDelegate::ShowDialog(gfx::NativeWindow owning_window,
                                    SimDialogMode mode) {
   chrome::ShowWebDialog(owning_window,
-                        ProfileManager::GetDefaultProfileOrOffTheRecord(),
+                        ProfileManager::GetActiveUserProfile(),
                         new SimDialogDelegate(mode));
 }