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

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

Issue 10854119: Minor whitepsace tweaks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/wm/window_manager_unittest.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) 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/event.h" 10 #include "ui/base/event.h"
(...skipping 24 matching lines...) Expand all
35 35
36 void TestActivationDelegate::SetWindow(aura::Window* window) { 36 void TestActivationDelegate::SetWindow(aura::Window* window) {
37 window_ = window; 37 window_ = window;
38 aura::client::SetActivationDelegate(window, this); 38 aura::client::SetActivationDelegate(window, this);
39 } 39 }
40 40
41 bool TestActivationDelegate::ShouldActivate(const ui::Event* event) { 41 bool TestActivationDelegate::ShouldActivate(const ui::Event* event) {
42 should_activate_count_++; 42 should_activate_count_++;
43 return activate_; 43 return activate_;
44 } 44 }
45
45 void TestActivationDelegate::OnActivated() { 46 void TestActivationDelegate::OnActivated() {
46 activated_count_++; 47 activated_count_++;
47 } 48 }
49
48 void TestActivationDelegate::OnLostActive() { 50 void TestActivationDelegate::OnLostActive() {
49 if (lost_active_count_++ == 0) 51 if (lost_active_count_++ == 0)
50 window_was_active_ = wm::IsActiveWindow(window_); 52 window_was_active_ = wm::IsActiveWindow(window_);
51 } 53 }
52 54
53 } // namespace test 55 } // namespace test
54 } // namespace ash 56 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698