diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:18:39 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:18:39 +0000 |
| commit | 9fdaa60e2c54d1e70dbc92297ef200d2dc61f4a6 (patch) | |
| tree | 0a7ca3a188c192fe2add00f032d7220047a7afeb /ui/views/widget | |
| parent | 9c871e2e2466d527cbe02039b8420208dbb7d780 (diff) | |
| download | chromium_src-9fdaa60e2c54d1e70dbc92297ef200d2dc61f4a6.zip chromium_src-9fdaa60e2c54d1e70dbc92297ef200d2dc61f4a6.tar.gz chromium_src-9fdaa60e2c54d1e70dbc92297ef200d2dc61f4a6.tar.bz2 | |
Change status widget type to TYPE_WINDOW_FRAMELESS.
R=nkostylev@chromium.org
BUG=104192
TEST=Try to tab to status area on an aura build.
Review URL: http://codereview.chromium.org/9185002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 7c637df..9afafac 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -180,11 +180,13 @@ void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) { // Set up the transient child before the window is added. This way the // LayoutManager knows the window has a transient parent. gfx::NativeView parent = params.GetParent(); - if (parent) + if (parent && parent->type() != aura::client::WINDOW_TYPE_UNKNOWN) { parent->AddTransientChild(window_); + parent = NULL; + } // SetAlwaysOnTop before SetParent so that always-on-top container is used. SetAlwaysOnTop(params.keep_on_top); - window_->SetParent(NULL); + window_->SetParent(parent); } window_->set_ignore_events(!params.accept_events); // TODO(beng): do this some other way. |