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

Unified Diff: ash/shell.cc

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/shell.h ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 55f13e67755c2c751c063f23e6903efc8911a5b6..c8cfcf0b6ddeb04a6e25f96b16d48335b80a0289 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -59,6 +59,7 @@
#include "ash/utility/partial_screenshot_controller.h"
#include "ash/wm/ash_focus_rules.h"
#include "ash/wm/ash_native_cursor_manager.h"
+#include "ash/wm/aura/wm_globals_aura.h"
#include "ash/wm/coordinate_conversion.h"
#include "ash/wm/event_client_impl.h"
#include "ash/wm/lock_state_controller.h"
@@ -640,7 +641,6 @@ Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool)
scoped_target_root_window_(nullptr),
delegate_(delegate),
shelf_model_(new ShelfModel),
- window_positioner_(new WindowPositioner),
activation_client_(nullptr),
#if defined(OS_CHROMEOS)
display_configurator_(new ui::DisplayConfigurator()),
@@ -852,6 +852,10 @@ Shell::~Shell() {
void Shell::Init(const ShellInitParams& init_params) {
in_mus_ = init_params.in_mus;
+
+ wm_globals_.reset(new wm::WmGlobalsAura);
+ window_positioner_.reset(new WindowPositioner(wm_globals_.get()));
+
if (!in_mus_) {
native_cursor_manager_ = new AshNativeCursorManager;
#if defined(OS_CHROMEOS)
« no previous file with comments | « ash/shell.h ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698