diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 18:53:37 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 18:53:37 +0000 |
| commit | 884401d3322ee142251a017ac03b23f66467336a (patch) | |
| tree | 0fa0921aeed80a1fa98aa883ae7b47411c227fc7 /ui/views/widget | |
| parent | 9959eeb989af5ebebfa28a37284446c528c7fecf (diff) | |
| download | chromium_src-884401d3322ee142251a017ac03b23f66467336a.zip chromium_src-884401d3322ee142251a017ac03b23f66467336a.tar.gz chromium_src-884401d3322ee142251a017ac03b23f66467336a.tar.bz2 | |
Make javascript dialogs into top-level windows for desktop aura.
Also, correct aura window sizing on desktop aura for Windows.
BUG=230935, 234558, 225252
TEST=NONE (yet)
Review URL: https://chromiumcodereview.appspot.com/13896011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc index 579a0fe..440a614 100644 --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc @@ -545,7 +545,11 @@ void DesktopNativeWidgetAura::SetCursor(gfx::NativeCursor cursor) { void DesktopNativeWidgetAura::ClearNativeFocus() { desktop_root_window_host_->ClearNativeFocus(); - aura::client::GetFocusClient(window_)->ResetFocusWithinActiveWindow(window_); + + if (ShouldActivate()) { + aura::client::GetFocusClient(window_)-> + ResetFocusWithinActiveWindow(window_); + } } gfx::Rect DesktopNativeWidgetAura::GetWorkAreaBoundsInScreen() const { |