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

Unified Diff: ash/mus/accelerators/accelerator_controller_unittest.cc

Issue 2625843002: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: definition in wm_root_window_controller.cc 2 Created 3 years, 11 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/wm_window.h ('k') | ash/mus/bridge/wm_lookup_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/mus/accelerators/accelerator_controller_unittest.cc b/ash/mus/accelerators/accelerator_controller_unittest.cc
index f7e999dfb24191ae6051eba48ee1a388a508640c..3f15e38c05636c4c8bb1d12439c7c99577df5ce9 100644
--- a/ash/mus/accelerators/accelerator_controller_unittest.cc
+++ b/ash/mus/accelerators/accelerator_controller_unittest.cc
@@ -18,7 +18,6 @@
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_lookup.h"
-#include "ash/common/wm_root_window_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/mus/accelerators/accelerator_controller_registrar_test_api.h"
#include "ash/mus/bridge/wm_shell_mus_test_api.h"
@@ -26,6 +25,7 @@
#include "ash/mus/property_util.h"
#include "ash/mus/test/wm_test_base.h"
#include "ash/public/cpp/shell_window_ids.h"
+#include "ash/root_window_controller.h"
#include "base/test/user_action_tester.cc"
#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "ui/aura/client/aura_constants.h"
« no previous file with comments | « ash/common/wm_window.h ('k') | ash/mus/bridge/wm_lookup_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698