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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 14222019: Trying to activate a window in a workspace other than the current is ignored while a system modal d… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 2435 matching lines...) Expand 10 before | Expand all | Expand 10 after
2446 void RenderWidgetHostViewAura::OnWindowActivated(aura::Window* gained_active, 2446 void RenderWidgetHostViewAura::OnWindowActivated(aura::Window* gained_active,
2447 aura::Window* lost_active) { 2447 aura::Window* lost_active) {
2448 DCHECK(window_ == gained_active || window_ == lost_active); 2448 DCHECK(window_ == gained_active || window_ == lost_active);
2449 if (window_ == gained_active) { 2449 if (window_ == gained_active) {
2450 const ui::Event* event = window_->GetRootWindow()->current_event(); 2450 const ui::Event* event = window_->GetRootWindow()->current_event();
2451 if (event && PointerEventActivates(*event)) 2451 if (event && PointerEventActivates(*event))
2452 host_->OnPointerEventActivate(); 2452 host_->OnPointerEventActivate();
2453 } 2453 }
2454 } 2454 }
2455 2455
2456 void RenderWidgetHostViewAura::OnWindowActivationRequestCompleted(
2457 aura::Window* request_active, aura::Window* actual_active) {
2458 }
2459
2456 //////////////////////////////////////////////////////////////////////////////// 2460 ////////////////////////////////////////////////////////////////////////////////
2457 // RenderWidgetHostViewAura, aura::client::FocusChangeObserver implementation: 2461 // RenderWidgetHostViewAura, aura::client::FocusChangeObserver implementation:
2458 2462
2459 void RenderWidgetHostViewAura::OnWindowFocused(aura::Window* gained_focus, 2463 void RenderWidgetHostViewAura::OnWindowFocused(aura::Window* gained_focus,
2460 aura::Window* lost_focus) { 2464 aura::Window* lost_focus) {
2461 DCHECK(window_ == gained_focus || window_ == lost_focus); 2465 DCHECK(window_ == gained_focus || window_ == lost_focus);
2462 if (window_ == gained_focus) { 2466 if (window_ == gained_focus) {
2463 // We need to honor input bypass if the associated tab is does not want 2467 // We need to honor input bypass if the associated tab is does not want
2464 // input. This gives the current focused window a chance to be the text 2468 // input. This gives the current focused window a chance to be the text
2465 // input client and handle events. 2469 // input client and handle events.
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
2845 RenderWidgetHost* widget) { 2849 RenderWidgetHost* widget) {
2846 return new RenderWidgetHostViewAura(widget); 2850 return new RenderWidgetHostViewAura(widget);
2847 } 2851 }
2848 2852
2849 // static 2853 // static
2850 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 2854 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
2851 GetScreenInfoForWindow(results, NULL); 2855 GetScreenInfoForWindow(results, NULL);
2852 } 2856 }
2853 2857
2854 } // namespace content 2858 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698