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
hylschwy · May 2, 2013 · 884401d · 884401d
1 parent 9959eeb
commit 884401d
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 8 deletions.
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
@@ -84,13 +84,20 @@ JavaScriptAppModalDialog::~JavaScriptAppModalDialog() {
 NativeAppModalDialog* JavaScriptAppModalDialog::CreateNativeDialog() {
   gfx::NativeWindow parent_window =
       web_contents()->GetView()->GetTopLevelNativeWindow();
+
 #if defined(USE_AURA)
+#if defined(OS_WIN)
+  // JS dialogs should always be top-level windows in desktop Aura on Windows.
+  parent_window = NULL;
+#else
   if (!parent_window->GetRootWindow()) {
     // When we are part of a WebContents that isn't actually being displayed on
     // the screen, we can't actually attach to it.
     parent_window = NULL;
   }
-#endif
+#endif  // defined(OS_WIN)
+#endif  // defined(USE_AURA)
+
   return NativeAppModalDialog::CreateNativeJavaScriptPrompt(this,
                                                             parent_window);
 }

diff --git 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 {

diff --git a/ui/views/win/hwnd_util.h b/ui/views/win/hwnd_util.h
@@ -6,6 +6,7 @@
 #define UI_VIEWS_WIN_HWND_UTIL_H_
 
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
 #include "ui/views/views_export.h"
 
 namespace views {
@@ -25,6 +26,8 @@ VIEWS_EXPORT HWND HWNDForNativeView(gfx::NativeView view);
 // Returns the HWND for the specified NativeWindow.
 VIEWS_EXPORT HWND HWNDForNativeWindow(gfx::NativeWindow window);
 
+VIEWS_EXPORT gfx::Rect GetWindowBoundsForClientBounds(
+    View* view, const gfx::Rect& client_bounds);
 }
 
 #endif  // UI_VIEWS_WIN_HWND_UTIL_H_
diff --git a/ui/views/win/hwnd_util_aurawin.cc b/ui/views/win/hwnd_util_aurawin.cc
@@ -27,4 +27,20 @@ HWND HWNDForNativeWindow(gfx::NativeWindow window) {
       window->GetRootWindow()->GetAcceleratedWidget() : NULL;
 }
 
+gfx::Rect GetWindowBoundsForClientBounds(View* view,
+                                         const gfx::Rect& client_bounds) {
+  DCHECK(view);
+  aura::RootWindow* window =
+      view->GetWidget()->GetNativeWindow()->GetRootWindow();
+  if (window) {
+    HWND hwnd = window->GetAcceleratedWidget();
+    RECT rect = client_bounds.ToRECT();
+    DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
+    DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
+    AdjustWindowRectEx(&rect, style, FALSE, ex_style);
+    return gfx::Rect(rect);
+  }
+  return client_bounds;
 }
+
+}  // namespace views
diff --git a/ui/views/win/hwnd_util_win.cc b/ui/views/win/hwnd_util_win.cc
@@ -25,4 +25,15 @@ HWND HWNDForNativeWindow(gfx::NativeWindow window) {
   return window;
 }
 
+gfx::Rect GetWindowBoundsForClientBounds(View* view,
+                                         const gfx::Rect& client_bounds) {
+  DCHECK(view);
+  HWND hwnd = view->GetWidget()->GetNativeWindow();
+  RECT rect = client_bounds.ToRECT();
+  DWORD style = ::GetWindowLong(hwnd, GWL_STYLE);
+  DWORD ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
+  AdjustWindowRectEx(&rect, style, FALSE, ex_style);
+  return gfx::Rect(rect);
 }
+
+}  // namespace views
diff --git a/ui/views/window/native_frame_view.cc b/ui/views/window/native_frame_view.cc
@@ -7,6 +7,10 @@
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
 
+#if defined(OS_WIN)
+#include "ui/views/win/hwnd_util.h"
+#endif
+
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -29,12 +33,9 @@ gfx::Rect NativeFrameView::GetBoundsForClientView() const {
 
 gfx::Rect NativeFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  RECT rect = client_bounds.ToRECT();
-  DWORD style = ::GetWindowLong(GetWidget()->GetNativeView(), GWL_STYLE);
-  DWORD ex_style = ::GetWindowLong(GetWidget()->GetNativeView(), GWL_EXSTYLE);
-  AdjustWindowRectEx(&rect, style, FALSE, ex_style);
-  return gfx::Rect(rect);
+#if defined(OS_WIN)
+  return views::GetWindowBoundsForClientBounds(
+      static_cast<View*>(const_cast<NativeFrameView*>(this)), client_bounds);
 #else
   // TODO(sad):
   return client_bounds;