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

Side by Side Diff: ash/test/test_activation_delegate.h

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 #ifndef ASH_TEST_TEST_ACTIVATION_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
6 #define ASH_TEST_TEST_ACTIVATION_DELEGATE_H_ 6 #define ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/aura/client/activation_change_observer.h" 10 #include "ui/aura/client/activation_change_observer.h"
(...skipping 28 matching lines...) Expand all
39 window_was_active_ = false; 39 window_was_active_ = false;
40 } 40 }
41 41
42 // Overridden from aura::client::ActivationDelegate: 42 // Overridden from aura::client::ActivationDelegate:
43 virtual bool ShouldActivate() const OVERRIDE; 43 virtual bool ShouldActivate() const OVERRIDE;
44 44
45 private: 45 private:
46 // Overridden from aura::client::ActivationChangeObserver: 46 // Overridden from aura::client::ActivationChangeObserver:
47 virtual void OnWindowActivated(aura::Window* gained_active, 47 virtual void OnWindowActivated(aura::Window* gained_active,
48 aura::Window* lost_active) OVERRIDE; 48 aura::Window* lost_active) OVERRIDE;
49 virtual void OnWindowActivationRequestCompleted(
50 aura::Window* request_active, aura::Window* actual_active) OVERRIDE;
49 51
50 aura::Window* window_; 52 aura::Window* window_;
51 bool window_was_active_; 53 bool window_was_active_;
52 bool activate_; 54 bool activate_;
53 int activated_count_; 55 int activated_count_;
54 int lost_active_count_; 56 int lost_active_count_;
55 mutable int should_activate_count_; 57 mutable int should_activate_count_;
56 58
57 DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate); 59 DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate);
58 }; 60 };
59 61
60 } // namespace test 62 } // namespace test
61 } // namespace ash 63 } // namespace ash
62 64
63 #endif // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_ 65 #endif // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698