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

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

Issue 9035001: Move some more WM functionality down into ash. (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
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 "ash/wm/window_util.h"
7 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
8 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
9 #include "ui/aura_shell/window_util.h"
10 10
11 namespace aura_shell { 11 namespace aura_shell {
12 namespace test { 12 namespace test {
13 13
14 //////////////////////////////////////////////////////////////////////////////// 14 ////////////////////////////////////////////////////////////////////////////////
15 // TestActivationDelegate 15 // TestActivationDelegate
16 16
17 TestActivationDelegate::TestActivationDelegate() 17 TestActivationDelegate::TestActivationDelegate()
18 : window_(NULL), 18 : window_(NULL),
19 window_was_active_(false), 19 window_was_active_(false),
(...skipping 24 matching lines...) Expand all
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/shell_accelerator_controller_unittest.cc ('k') | ui/aura_shell/toplevel_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698