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

Side by Side Diff: ash/test/test_activation_delegate.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 "ash/test/test_activation_delegate.h" 5 #include "ash/test/test_activation_delegate.h"
6 6
7 #include "ash/wm/window_util.h" 7 #include "ash/wm/window_util.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/base/events/event.h" 10 #include "ui/base/events/event.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 aura::Window* lost_active) { 48 aura::Window* lost_active) {
49 DCHECK(window_ == gained_active || window_ == lost_active); 49 DCHECK(window_ == gained_active || window_ == lost_active);
50 if (window_ == gained_active) { 50 if (window_ == gained_active) {
51 activated_count_++; 51 activated_count_++;
52 } else if (window_ == lost_active) { 52 } else if (window_ == lost_active) {
53 if (lost_active_count_++ == 0) 53 if (lost_active_count_++ == 0)
54 window_was_active_ = wm::IsActiveWindow(window_); 54 window_was_active_ = wm::IsActiveWindow(window_);
55 } 55 }
56 } 56 }
57 57
58 void TestActivationDelegate::OnWindowActivationRequestCompleted(
59 aura::Window* request_active, aura::Window* actual_active) {
60 }
61
58 } // namespace test 62 } // namespace test
59 } // namespace ash 63 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698