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

Unified Diff: ash/shell.h

Issue 1900443002: Removes aura dependencies from WindowPositioner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nuke GetWorkAreaForWindowInParent and fix windows Created 4 years, 8 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/shelf/shelf_tooltip_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 58e5566ecee11e4796fdfa996f782174bed7cd5b..ad61d18ff6446e19a824f65b601e4e06173dbe05 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -166,6 +166,10 @@ namespace test {
class ShellTestApi;
}
+namespace wm {
+class WmGlobalsAura;
+}
+
// Shell is a singleton object that presents the Shell API and implements the
// RootWindow's delegate interface.
//
@@ -642,6 +646,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// when the screen is initially created.
static bool initially_hide_cursor_;
+ std::unique_ptr<wm::WmGlobalsAura> wm_globals_;
+
// When no explicit target display/RootWindow is given, new windows are
// created on |scoped_target_root_window_| , unless NULL in
// which case they are created on |target_root_window_|.
@@ -695,6 +701,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<aura::client::FocusClient> focus_client_;
aura::client::ActivationClient* activation_client_;
+
std::unique_ptr<PartialScreenshotController> partial_screenshot_controller_;
std::unique_ptr<MouseCursorEventFilter> mouse_cursor_filter_;
« no previous file with comments | « ash/shelf/shelf_tooltip_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698