diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 00:48:31 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 00:48:31 +0000 |
| commit | c95ec93e47364e0386e1a1ac09b353e6e2c83b45 (patch) | |
| tree | 1bdd91a44ddced8a6fb56f849a1aadc5e3fcda56 /ui/views/test/test_views_delegate.h | |
| parent | ff3761a21bdd9985d559d45e50fbaecf69df16ab (diff) | |
| download | chromium_src-c95ec93e47364e0386e1a1ac09b353e6e2c83b45.zip chromium_src-c95ec93e47364e0386e1a1ac09b353e6e2c83b45.tar.gz chromium_src-c95ec93e47364e0386e1a1ac09b353e6e2c83b45.tar.bz2 | |
Recommitting Aura/ash split: Remove hacks and get chrome linking without ash.
This changes TestViewsDelegate::CreateNativeWidgetHelper to always return NULL, and for views_examples_exe to use its own subclass that create the desktop implementation.
For the first time now, you can do:
> build/gyp_chromium -Duse_aura=1 -Duse_ash=0
And get a running chrome. It has lots of issues, especially related to
window placement, tab handling, etc, but it pops up and renders web content.
Also consolidates most of the desktop behavior into its own class.
Also makes views_examples_exe work again. Several of the hacks are no longer
needed after Ben's refactoring to support WebView.
BUG=116458,119759
TEST=none
First Review URL: http://codereview.chromium.org/10081022
Review URL: http://codereview.chromium.org/10083058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/test/test_views_delegate.h')
| -rw-r--r-- | ui/views/test/test_views_delegate.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h index 99976a2..1ea5cdf 100644 --- a/ui/views/test/test_views_delegate.h +++ b/ui/views/test/test_views_delegate.h @@ -59,6 +59,11 @@ class TestViewsDelegate : public ViewsDelegate { virtual int GetDispositionForEvent(int event_flags) OVERRIDE; +#if defined(USE_AURA) + virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper( + views::NativeWidgetAura* native_widget) OVERRIDE; +#endif + private: mutable scoped_ptr<ui::Clipboard> clipboard_; bool use_transparent_windows_; |