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

Unified Diff: ash/common/wm_shell.cc

Issue 2505783002: chromeos: Migrate SignOut and RequestRestartForUpdate to mojo interface (Closed)
Patch Set: Created 4 years, 1 month 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 | « ash/common/test/test_system_tray_delegate.cc ('k') | ash/public/interfaces/system_tray.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 98cd1ce22545b277ab2d90a4e63d492738722820..c0c4268ad0642918b70a373fb64beaacaeacbfb4 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -355,15 +355,17 @@ void WmShell::SetSystemTrayDelegate(
system_tray_delegate_ = std::move(delegate);
system_tray_delegate_->Initialize();
#if defined(OS_CHROMEOS)
+ // Accesses WmShell in its constructor.
James Cook 2016/11/15 22:43:18 I left this where it is because WmShell is probabl
logout_confirmation_controller_.reset(new LogoutConfirmationController(
- base::Bind(&SystemTrayDelegate::SignOut,
- base::Unretained(system_tray_delegate_.get()))));
+ base::Bind(&SystemTrayController::SignOut,
+ base::Unretained(system_tray_controller_.get()))));
#endif
}
void WmShell::DeleteSystemTrayDelegate() {
DCHECK(system_tray_delegate_);
#if defined(OS_CHROMEOS)
+ // Accesses WmShell in its destructor.
logout_confirmation_controller_.reset();
#endif
system_tray_delegate_.reset();
« no previous file with comments | « ash/common/test/test_system_tray_delegate.cc ('k') | ash/public/interfaces/system_tray.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698