diff options
| author | raymes@google.com <raymes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 02:43:59 +0000 |
|---|---|---|
| committer | raymes@google.com <raymes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 02:43:59 +0000 |
| commit | 984cb9c9dcbf1631b506edad498e174e9cec1385 (patch) | |
| tree | dea2d1f6f7a0c3afccb19ee1c054191b5cb7b843 /ash/test/ash_test_helper.cc | |
| parent | 4fe1bec5e5427b73ef05cea950b3fc279dc2896b (diff) | |
| download | chromium_src-984cb9c9dcbf1631b506edad498e174e9cec1385.zip chromium_src-984cb9c9dcbf1631b506edad498e174e9cec1385.tar.gz chromium_src-984cb9c9dcbf1631b506edad498e174e9cec1385.tar.bz2 | |
Revert 270290 "Reduce creation of ViewsDelegate"
Speculatively reverting as it may have caused the tree to break: http://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/20345/steps/compile/logs/stdio
> Reduce creation of ViewsDelegate
>
> By consolidating override of OnBeforeWidgetInit that finds shell many
> of the places that were setting a viewsdelegate no longer need to.
>
> Also, made AshTestHelper install a ViewsDelegate so that tests don't have.
>
> Because of removed an include of views_delegate from ash_test_helper I had to update some includes.
>
> BUG=none
> TEST=none
> R=ben@chromium.org
>
> Review URL: https://codereview.chromium.org/280863002
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/286753002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index a59019b..9cf3488 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -7,7 +7,6 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/ash_switches.h" #include "ash/shell.h" -#include "ash/test/ash_test_views_delegate.h" #include "ash/test/display_manager_test_api.h" #include "ash/test/shell_test_api.h" #include "ash/test/test_screenshot_delegate.h" @@ -23,6 +22,7 @@ #include "ui/compositor/test/context_factories_for_test.h" #include "ui/message_center/message_center.h" #include "ui/wm/core/capture_controller.h" +#include "ui/wm/core/wm_state.h" #if defined(OS_CHROMEOS) #include "chromeos/audio/cras_audio_handler.h" @@ -56,7 +56,7 @@ AshTestHelper::~AshTestHelper() { } void AshTestHelper::SetUp(bool start_session) { - views_delegate_.reset(new AshTestViewsDelegate); + wm_state_.reset(new wm::WMState); // Disable animations during tests. zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( @@ -133,7 +133,7 @@ void AshTestHelper::TearDown() { CHECK(!wm::ScopedCaptureClient::IsActive()); - views_delegate_.reset(); + wm_state_.reset(); } void AshTestHelper::RunAllPendingInMessageLoop() { |