Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 13896011: Make javascript dialogs into top-level windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix non-aura build. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc ('k') | ui/views/win/hwnd_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
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 39b862ec9b2d1ce5b6aa8ad5e6af324ad8850cbb..ac557f016441dda88d971cfa6fe7463ec45420e7 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 {
« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc ('k') | ui/views/win/hwnd_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698