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

Side by Side Diff: ui/aura_shell/test/test_activation_delegate.cc

Issue 8956004: Move ActivationClient/Delegate to client namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « ui/aura_shell/test/test_activation_delegate.h ('k') | ui/aura_shell/window_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/test/test_activation_delegate.h" 5 #include "ui/aura_shell/test/test_activation_delegate.h"
6 6
7 #include "ui/aura/client/aura_constants.h" 7 #include "ui/aura/client/aura_constants.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/aura_shell/window_util.h" 9 #include "ui/aura_shell/window_util.h"
10 10
(...skipping 16 matching lines...) Expand all
27 : window_(NULL), 27 : window_(NULL),
28 window_was_active_(false), 28 window_was_active_(false),
29 activate_(activate), 29 activate_(activate),
30 activated_count_(0), 30 activated_count_(0),
31 lost_active_count_(0), 31 lost_active_count_(0),
32 should_activate_count_(0) { 32 should_activate_count_(0) {
33 } 33 }
34 34
35 void TestActivationDelegate::SetWindow(aura::Window* window) { 35 void TestActivationDelegate::SetWindow(aura::Window* window) {
36 window_ = window; 36 window_ = window;
37 aura::ActivationDelegate::SetActivationDelegate(window, this); 37 aura::client::SetActivationDelegate(window, this);
38 } 38 }
39 39
40 bool TestActivationDelegate::ShouldActivate(aura::Event* event) { 40 bool TestActivationDelegate::ShouldActivate(aura::Event* event) {
41 should_activate_count_++; 41 should_activate_count_++;
42 return activate_; 42 return activate_;
43 } 43 }
44 void TestActivationDelegate::OnActivated() { 44 void TestActivationDelegate::OnActivated() {
45 activated_count_++; 45 activated_count_++;
46 } 46 }
47 void TestActivationDelegate::OnLostActive() { 47 void TestActivationDelegate::OnLostActive() {
48 if (lost_active_count_++ == 0) 48 if (lost_active_count_++ == 0)
49 window_was_active_ = IsActiveWindow(window_); 49 window_was_active_ = IsActiveWindow(window_);
50 } 50 }
51 51
52 } // namespace test 52 } // namespace test
53 } // namespace aura_shell 53 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/test/test_activation_delegate.h ('k') | ui/aura_shell/window_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698