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

Side by Side Diff: ui/wm/core/cursor_manager_unittest.cc

Issue 209383003: Move wm/public into wm target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ui/wm/core/cursor_manager.h ('k') | ui/wm/core/default_activation_client.h » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/wm/core/cursor_manager.h" 5 #include "ui/wm/core/cursor_manager.h"
6 6
7 #include "ui/aura/client/cursor_client_observer.h" 7 #include "ui/aura/client/cursor_client_observer.h"
8 #include "ui/aura/test/aura_test_base.h"
9 #include "ui/wm/core/native_cursor_manager.h" 8 #include "ui/wm/core/native_cursor_manager.h"
9 #include "ui/wm/test/wm_test_base.h"
10 10
11 namespace { 11 namespace {
12 12
13 class TestingCursorManager : public wm::NativeCursorManager { 13 class TestingCursorManager : public wm::NativeCursorManager {
14 public: 14 public:
15 // Overridden from wm::NativeCursorManager: 15 // Overridden from wm::NativeCursorManager:
16 virtual void SetDisplay( 16 virtual void SetDisplay(
17 const gfx::Display& display, 17 const gfx::Display& display,
18 wm::NativeCursorManagerDelegate* delegate) OVERRIDE {} 18 wm::NativeCursorManagerDelegate* delegate) OVERRIDE {}
19 19
(...skipping 23 matching lines...) Expand all
43 43
44 virtual void SetScale( 44 virtual void SetScale(
45 float scale, 45 float scale,
46 wm::NativeCursorManagerDelegate* delegate) OVERRIDE { 46 wm::NativeCursorManagerDelegate* delegate) OVERRIDE {
47 delegate->CommitScale(scale); 47 delegate->CommitScale(scale);
48 } 48 }
49 }; 49 };
50 50
51 } // namespace 51 } // namespace
52 52
53 class CursorManagerTest : public aura::test::AuraTestBase { 53 class CursorManagerTest : public wm::WMTestBase {
54 protected: 54 protected:
55 CursorManagerTest() 55 CursorManagerTest()
56 : delegate_(new TestingCursorManager), 56 : delegate_(new TestingCursorManager),
57 cursor_manager_(scoped_ptr<wm::NativeCursorManager>( 57 cursor_manager_(scoped_ptr<wm::NativeCursorManager>(
58 delegate_)) { 58 delegate_)) {
59 } 59 }
60 60
61 TestingCursorManager* delegate_; 61 TestingCursorManager* delegate_;
62 wm::CursorManager cursor_manager_; 62 wm::CursorManager cursor_manager_;
63 }; 63 };
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 EXPECT_FALSE(observer_a.is_cursor_visible()); 344 EXPECT_FALSE(observer_a.is_cursor_visible());
345 345
346 // Show the cursor using ShowCursor(). 346 // Show the cursor using ShowCursor().
347 observer_a.reset(); 347 observer_a.reset();
348 observer_b.reset(); 348 observer_b.reset();
349 cursor_manager_.ShowCursor(); 349 cursor_manager_.ShowCursor();
350 EXPECT_TRUE(observer_a.did_visibility_change()); 350 EXPECT_TRUE(observer_a.did_visibility_change());
351 EXPECT_FALSE(observer_b.did_visibility_change()); 351 EXPECT_FALSE(observer_b.did_visibility_change());
352 EXPECT_TRUE(observer_a.is_cursor_visible()); 352 EXPECT_TRUE(observer_a.is_cursor_visible());
353 } 353 }
OLDNEW
« no previous file with comments | « ui/wm/core/cursor_manager.h ('k') | ui/wm/core/default_activation_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698