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

Unified Diff: ash/test/ash_test_helper.cc

Issue 2191363002: Reland of "Apply Shelf/Dock opacity animations for the Material Design style." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added ShelfBackgoundAnimator::Initialize(ShelfBackgroundAnimatorObserver*). Created 4 years, 4 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/test/ash_test_helper.h ('k') | ash/test/material_design_controller_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index bd25987c3f659179e3e81b146fbd7813bcd957a5..e002797e15fe1f562af94743d4aebb77abf68c92 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -7,13 +7,13 @@
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
#include "ash/common/ash_switches.h"
#include "ash/common/display/display_info.h"
+#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/shell_init_params.h"
#include "ash/test/ash_test_views_delegate.h"
#include "ash/test/content/test_shell_content_state.h"
#include "ash/test/display_manager_test_api.h"
-#include "ash/test/material_design_controller_test_api.h"
#include "ash/test/shell_test_api.h"
#include "ash/test/test_screenshot_delegate.h"
#include "ash/test/test_session_state_delegate.h"
« no previous file with comments | « ash/test/ash_test_helper.h ('k') | ash/test/material_design_controller_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698