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

Unified Diff: ash/aura/wm_shell_aura.cc

Issue 2194353002: mash: Migrate ScopedTargetRootWindow to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: similarity 40 Created 4 years, 5 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
Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 29af4b96cb5e2fec943568fa8f1b110694aab52f..b08ee84ded451c07c854fecab5c53f6f88e0d3e6 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "ash/aura/scoped_root_window_for_new_windows_aura.h"
#include "ash/aura/wm_window_aura.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_delegate.h"
@@ -91,6 +92,12 @@ WmWindow* WmShellAura::GetRootWindowForNewWindows() {
return WmWindowAura::Get(Shell::GetTargetRootWindow());
}
+std::unique_ptr<ScopedRootWindowForNewWindows>
+WmShellAura::CreateScopedRootWindowForNewWindows(WmWindow* root) {
+ return base::MakeUnique<ScopedRootWindowForNewWindowsAura>(
+ WmWindowAura::GetAuraWindow(root));
+}
+
const DisplayInfo& WmShellAura::GetDisplayInfo(int64_t display_id) const {
return Shell::GetInstance()->display_manager()->GetDisplayInfo(display_id);
}

Powered by Google App Engine
This is Rietveld 408576698