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_views_delegate.h | |
| 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_views_delegate.h')
| -rw-r--r-- | ash/test/ash_test_views_delegate.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/ash/test/ash_test_views_delegate.h b/ash/test/ash_test_views_delegate.h deleted file mode 100644 index 6fd8bd4..0000000 --- a/ash/test/ash_test_views_delegate.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_ -#define ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_ - -#include "ui/views/test/test_views_delegate.h" - -namespace ash { -namespace test { - -// Ash specific ViewsDelegate. In addition to creating a TestWebContents this -// parents widget with no parent/context to the shell. This is created by -// default AshTestHelper. -class AshTestViewsDelegate : public views::TestViewsDelegate { - public: - AshTestViewsDelegate(); - virtual ~AshTestViewsDelegate(); - - // Overriden from TestViewsDelegate. - virtual content::WebContents* CreateWebContents( - content::BrowserContext* browser_context, - content::SiteInstance* site_instance) OVERRIDE; - virtual void OnBeforeWidgetInit( - views::Widget::InitParams* params, - views::internal::NativeWidgetDelegate* delegate) OVERRIDE; - - private: - DISALLOW_COPY_AND_ASSIGN(AshTestViewsDelegate); -}; - -} // namespace test -} // namespace ash - -#endif // ASH_TEST_ASH_TEST_VIEWS_DELEGATE_H_ - |