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

Unified Diff: ash/wm/screen_dimmer_unittest.cc

Issue 2320273002: Refactors DimWindow and moves to ash/common (Closed)
Patch Set: feedback and member initializer ordering Created 4 years, 3 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/wm/screen_dimmer.cc ('k') | ash/wm/screen_pinning_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/screen_dimmer_unittest.cc
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc
index e94c727ac29e1a0e0f6974215aff27830a4e70cc..d0d500db9b2399102a389edddbaaf1c27a892f6d 100644
--- a/ash/wm/screen_dimmer_unittest.cc
+++ b/ash/wm/screen_dimmer_unittest.cc
@@ -6,11 +6,13 @@
#include <memory>
+#include "ash/aura/wm_window_aura.h"
+#include "ash/common/wm/window_dimmer.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window_user_data.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/dim_window.h"
-//#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/test/test_windows.h"
#include "ui/compositor/layer.h"
@@ -28,7 +30,10 @@ class ScreenDimmerTest : public AshTestBase {
}
aura::Window* GetDimWindow() {
- return DimWindow::Get(Shell::GetPrimaryRootWindow());
+ WindowDimmer* window_dimmer =
+ dimmer_->window_dimmers_->Get(WmShell::Get()->GetPrimaryRootWindow());
+ return window_dimmer ? WmWindowAura::GetAuraWindow(window_dimmer->window())
+ : nullptr;
}
ui::Layer* GetDimWindowLayer() {
« no previous file with comments | « ash/wm/screen_dimmer.cc ('k') | ash/wm/screen_pinning_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698