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

Unified Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: merge Created 4 years 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 | « no previous file | ash/aura/wm_window_aura.h » ('j') | ash/aura/wm_window_aura.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.cc
diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
index eae1b44e73b537f6b35adf561b158dde6cc91211..6fdb4725b9e3b069a9b80231cf5b81b131e70465 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -11,6 +11,7 @@
#include "ash/display/window_tree_host_manager.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
+#include "ui/aura/env.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_property.h"
@@ -55,6 +56,7 @@ const WmRootWindowControllerAura* WmRootWindowControllerAura::Get(
if (wm_root_window_controller)
return wm_root_window_controller;
+ DCHECK_EQ(aura::Env::Mode::LOCAL, aura::Env::GetInstance()->mode());
// WmRootWindowControllerAura is owned by the RootWindowController's window.
return new WmRootWindowControllerAura(root_window_controller);
}
« no previous file with comments | « no previous file | ash/aura/wm_window_aura.h » ('j') | ash/aura/wm_window_aura.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698