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

Unified Diff: trunk/src/ash/test/ash_test_helper.h

Issue 286753002: Revert 270290 "Reduce creation of ViewsDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/ash/test/ash_test_base.cc ('k') | trunk/src/ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/test/ash_test_helper.h
===================================================================
--- trunk/src/ash/test/ash_test_helper.h (revision 270304)
+++ trunk/src/ash/test/ash_test_helper.h (working copy)
@@ -20,8 +20,8 @@
class ScopedAnimationDurationScaleMode;
} // namespace ui
-namespace views {
-class ViewsDelegate;
+namespace wm {
+class WMState;
}
namespace ash {
@@ -77,7 +77,7 @@
// Owned by ash::AcceleratorController
TestScreenshotDelegate* test_screenshot_delegate_;
- scoped_ptr<views::ViewsDelegate> views_delegate_;
+ scoped_ptr<wm::WMState> wm_state_;
// Check if DBus Thread Manager was initialized here.
bool dbus_thread_manager_initialized_;
« no previous file with comments | « trunk/src/ash/test/ash_test_base.cc ('k') | trunk/src/ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698