Removal of GetDefaultProfile for new charger messages

chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc

 // Copyright (c) 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/charger_replace/charger_replacement_dialog.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ skipping 55 matching lines @@
 void ChargerReplacementDialog::SetFocusOnChargerDialogIfVisible() {
   if (is_window_visible_ && current_window_)
     current_window_->Focus();
 }
 
 void ChargerReplacementDialog::Show() {
   content::RecordAction(
         content::UserMetricsAction("ShowChargerReplacementDialog"));
 
   is_window_visible_ = true;
-  current_window_ = chrome::ShowWebDialog(parent_window_,
-                                          ProfileManager::GetDefaultProfile(),
-                                          this);
+  // We show the dialog for the active user, so that the dialog will get
+  // displayed immediately. The parent window is a system modal/lock container
+  // and does not belong to any user.
+  current_window_ = chrome::ShowWebDialog(
+      parent_window_,
+      ProfileManager::GetActiveUserProfile(),
+      this);

[jennyz, 2014/01/08 18:43:03]

Will ProfileManager::GetActiveUserProfile() replacement work for the case of the
login screen, ie, no user has logged in?

[Mr4D (OOO till 08-26), 2014/01/08 18:58:28]

Yes. It does the same logic as the old "GetDefaultProfile" there. As such it
will also work with the guest mode and such.

   charger_replacement_handler_->set_charger_window(current_window_);
 }
 
 ui::ModalType ChargerReplacementDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
 base::string16 ChargerReplacementDialog::GetDialogTitle() const {
   return l10n_util::GetStringUTF16(IDS_CHARGER_REPLACEMENT_DIALOG_TITLE);
 }
@@ skipping 46 matching lines @@
   return true;
 }
 
 bool ChargerReplacementDialog::HandleContextMenu(
     const content::ContextMenuParams& params) {
   // Disable context menu.
   return true;
 }
 
 }  // namespace chromeos