diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 08:30:20 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 08:30:20 +0000 |
| commit | 36c6f3c16f607402c551b22fc898b5ddabec8a4a (patch) | |
| tree | f2ecaf83dd2a99051046d7a56e5702542b1d808d /ui/views | |
| parent | 00b286b0bdb038f43850b39307783ddbc802efb0 (diff) | |
| download | chromium_src-36c6f3c16f607402c551b22fc898b5ddabec8a4a.zip chromium_src-36c6f3c16f607402c551b22fc898b5ddabec8a4a.tar.gz chromium_src-36c6f3c16f607402c551b22fc898b5ddabec8a4a.tar.bz2 | |
Don't activate TYPE_CONTROL on aura only.
Looks like TYPE_CONTROL has to be activatable in order for its parent to be activated on Windows.
On aura, this is handled by the aura itself.
(Here is the original CL: http://codereview.chromium.org/8872043)
BUG=121499
TEST=manually
Review URL: https://chromiumcodereview.appspot.com/10382042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 3 | ||||
| -rw-r--r-- | ui/views/widget/widget.cc | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 86097cd..d840fa1 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -216,7 +216,8 @@ void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) { else SetBounds(params.bounds); window_->set_ignore_events(!params.accept_events); - can_activate_ = params.can_activate; + can_activate_ = + params.can_activate && params.type != Widget::InitParams::TYPE_CONTROL; DCHECK(GetWidget()->GetRootView()); #if !defined(OS_MACOSX) if (params.type != Widget::InitParams::TYPE_TOOLTIP) diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index c2f5ebf..2cb0caa 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -130,8 +130,7 @@ Widget::InitParams::InitParams(Type type) ViewsDelegate::views_delegate && ViewsDelegate::views_delegate->UseTransparentWindows()), accept_events(true), - can_activate( - type != TYPE_POPUP && type != TYPE_MENU && type != TYPE_CONTROL), + can_activate(type != TYPE_POPUP && type != TYPE_MENU), keep_on_top(type == TYPE_MENU), ownership(NATIVE_WIDGET_OWNS_WIDGET), mirror_origin_in_rtl(false), |