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

Unified Diff: ash/system/session/logout_confirmation_dialog.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)
Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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 | « ash/system/palette/palette_utils.cc ('k') | ash/system/toast/toast_overlay.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/session/logout_confirmation_dialog.cc
diff --git a/ash/system/session/logout_confirmation_dialog.cc b/ash/system/session/logout_confirmation_dialog.cc
index 4a5ccc798a24761771c865c22ac4472e659850e7..20a8ced2c2958a33e2bef99259f762028d559976 100644
--- a/ash/system/session/logout_confirmation_dialog.cc
+++ b/ash/system/session/logout_confirmation_dialog.cc
@@ -6,7 +6,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shell_port.h"
+#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/session/logout_confirmation_controller.h"
#include "ash/system/tray/tray_constants.h"
@@ -50,9 +50,7 @@ LogoutConfirmationDialog::LogoutConfirmationDialog(
views::Widget* widget = new views::Widget;
views::Widget::InitParams params =
GetDialogWidgetInitParams(this, nullptr, nullptr, gfx::Rect());
- ShellPort::Get()
- ->GetPrimaryRootWindow()
- ->GetRootWindowController()
+ Shell::GetPrimaryRootWindowController()
->ConfigureWidgetInitParamsForContainer(
widget, kShellWindowId_SystemModalContainer, &params);
widget->Init(params);
« no previous file with comments | « ash/system/palette/palette_utils.cc ('k') | ash/system/toast/toast_overlay.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698