diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 20:32:14 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-18 20:32:14 +0000 |
commit | 1422809c9c890fb145978b73d3ace532ee31c521 (patch) | |
tree | ebe9893baeac2532ade814c5e504a71c045a32da /ash | |
parent | ab6697bbd446c43094ea3593f857e7c3f3c9327f (diff) | |
download | chromium_src-1422809c9c890fb145978b73d3ace532ee31c521.zip chromium_src-1422809c9c890fb145978b73d3ace532ee31c521.tar.gz chromium_src-1422809c9c890fb145978b73d3ace532ee31c521.tar.bz2 |
Aura/ash split: Remove hacks and get chrome linking without ash.
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
Review URL: http://codereview.chromium.org/10081022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 2aaaed2..0d4a1a5 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -52,6 +52,13 @@ class ShellViewsDelegate : public views::TestViewsDelegate { return true; } + views::NativeWidgetHelperAura* CreateNativeWidgetHelper( + views::NativeWidgetAura* native_widget) OVERRIDE { + // The default behavior of the test delegate is to work in desktop + // mode. Return NULL here so NativeWidgetAura uses our RootWindow instead. + return NULL; + } + private: DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate); }; |