diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-13 00:36:10 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-13 00:36:10 +0000 |
| commit | 543f27572597201d5fae77066c9146a6a87d41d8 (patch) | |
| tree | 0f938956855b9a75120d88af20d23be7e78bcf59 /content/browser | |
| parent | bdcf637f5c93605a9f81e9fa03e1c7cb9527c21f (diff) | |
| download | chromium_src-543f27572597201d5fae77066c9146a6a87d41d8.zip chromium_src-543f27572597201d5fae77066c9146a6a87d41d8.tar.gz chromium_src-543f27572597201d5fae77066c9146a6a87d41d8.tar.bz2 | |
Aura/Ash split: Make most unit tests compile without USE_ASH
BUG=116458
TEST=none
Review URL: http://codereview.chromium.org/10067019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/web_contents/web_contents_view_aura.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 811570c..421e563 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -213,7 +213,9 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size) { window_->SetType(aura::client::WINDOW_TYPE_CONTROL); window_->SetTransparent(false); window_->Init(ui::LAYER_NOT_DRAWN); +#if defined(USE_ASH) window_->SetParent(NULL); +#endif window_->layer()->SetMasksToBounds(true); window_->SetName("WebContentsViewAura"); } |