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 /ui/views/test | |
| 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 'ui/views/test')
| -rw-r--r-- | ui/views/test/test_views_delegate.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc index b507f51..d68eb3f 100644 --- a/ui/views/test/test_views_delegate.cc +++ b/ui/views/test/test_views_delegate.cc @@ -17,8 +17,7 @@ TestViewsDelegate::TestViewsDelegate() } TestViewsDelegate::~TestViewsDelegate() { - if (ViewsDelegate::views_delegate == this) - ViewsDelegate::views_delegate = NULL; + ViewsDelegate::views_delegate = NULL; } void TestViewsDelegate::SetUseTransparentWindows(bool transparent) { |