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

Unified Diff: ash/common/accelerators/exit_warning_handler.cc

Issue 2739553005: Moves maintaining root_window_for_new_windows_ to Shell (Closed)
Patch Set: remove ash:: Created 3 years, 9 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/common/accelerators/accelerator_controller.cc ('k') | ash/common/scoped_root_window_for_new_windows.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/accelerators/exit_warning_handler.cc
diff --git a/ash/common/accelerators/exit_warning_handler.cc b/ash/common/accelerators/exit_warning_handler.cc
index 9f6b97088a0a4d0eeffe0b38ca64699f0bed8c96..396c4d918dd11f3aba6a614a7deee08eac9f99fa 100644
--- a/ash/common/accelerators/exit_warning_handler.cc
+++ b/ash/common/accelerators/exit_warning_handler.cc
@@ -9,6 +9,7 @@
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -143,7 +144,7 @@ void ExitWarningHandler::CancelTimer() {
void ExitWarningHandler::Show() {
if (widget_)
return;
- WmWindow* root_window = WmShell::Get()->GetRootWindowForNewWindows();
+ WmWindow* root_window = Shell::GetWmRootWindowForNewWindows();
ExitWarningWidgetDelegateView* delegate = new ExitWarningWidgetDelegateView;
gfx::Size rs = root_window->GetBounds().size();
gfx::Size ps = delegate->GetPreferredSize();
« no previous file with comments | « ash/common/accelerators/accelerator_controller.cc ('k') | ash/common/scoped_root_window_for_new_windows.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698