Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Unified Diff: chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc

Issue 128583002: Removal of GetDefaultProfile for new charger messages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc
diff --git a/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc b/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc
index 442428c8befa21dde7be134d22e10df7742fcf68..9d1bfe8d23349b5a869a18b1b5fd46e8269b791e 100644
--- a/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc
+++ b/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc
@@ -73,9 +73,13 @@ void ChargerReplacementDialog::Show() {
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() replac
Mr4D (OOO till 08-26) 2014/01/08 18:58:28 Yes. It does the same logic as the old "GetDefault
charger_replacement_handler_->set_charger_window(current_window_);
}
« no previous file with comments | « chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698