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

Side by Side Diff: ui/aura/test/aura_test_helper.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 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
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/aura/test/aura_test_utils.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) 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 UI_AURA_TEST_AURA_TEST_HELPER_H_ 5 #ifndef UI_AURA_TEST_AURA_TEST_HELPER_H_
6 #define UI_AURA_TEST_AURA_TEST_HELPER_H_ 6 #define UI_AURA_TEST_AURA_TEST_HELPER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "ui/aura/window_event_dispatcher.h" 11 #include "ui/aura/window_event_dispatcher.h"
13 #include "ui/aura/window_tree_host.h" 12 #include "ui/aura/window_tree_host.h"
14 13
15 namespace aura { 14 namespace aura {
16 class Env; 15 class Env;
17 } 16 }
18 17
19 namespace base { 18 namespace base {
20 class MessageLoopForUI; 19 class MessageLoopForUI;
21 } 20 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 ui::EventProcessor* event_processor() { return host_->event_processor(); } 56 ui::EventProcessor* event_processor() { return host_->event_processor(); }
58 WindowTreeHost* host() { return host_.get(); } 57 WindowTreeHost* host() { return host_.get(); }
59 58
60 TestScreen* test_screen() { return test_screen_.get(); } 59 TestScreen* test_screen() { return test_screen_.get(); }
61 60
62 private: 61 private:
63 base::MessageLoopForUI* message_loop_; 62 base::MessageLoopForUI* message_loop_;
64 bool setup_called_; 63 bool setup_called_;
65 bool teardown_called_; 64 bool teardown_called_;
66 std::unique_ptr<aura::Env> env_; 65 std::unique_ptr<aura::Env> env_;
67 scoped_ptr<WindowTreeHost> host_; 66 std::unique_ptr<WindowTreeHost> host_;
68 scoped_ptr<TestWindowTreeClient> stacking_client_; 67 std::unique_ptr<TestWindowTreeClient> stacking_client_;
69 scoped_ptr<client::DefaultCaptureClient> capture_client_; 68 std::unique_ptr<client::DefaultCaptureClient> capture_client_;
70 scoped_ptr<client::FocusClient> focus_client_; 69 std::unique_ptr<client::FocusClient> focus_client_;
71 scoped_ptr<TestScreen> test_screen_; 70 std::unique_ptr<TestScreen> test_screen_;
72 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; 71 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
73 72
74 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper); 73 DISALLOW_COPY_AND_ASSIGN(AuraTestHelper);
75 }; 74 };
76 75
77 } // namespace test 76 } // namespace test
78 } // namespace aura 77 } // namespace aura
79 78
80 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_ 79 #endif // UI_AURA_TEST_AURA_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/aura/test/aura_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698