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

Side by Side Diff: ui/aura/test/aura_test_base.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/scoped_window_targeter.cc ('k') | ui/aura/test/aura_test_helper.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_BASE_H_ 5 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 Window* root_window() { return helper_->root_window(); } 43 Window* root_window() { return helper_->root_window(); }
44 WindowTreeHost* host() { return helper_->host(); } 44 WindowTreeHost* host() { return helper_->host(); }
45 ui::EventProcessor* event_processor() { return helper_->event_processor(); } 45 ui::EventProcessor* event_processor() { return helper_->event_processor(); }
46 TestScreen* test_screen() { return helper_->test_screen(); } 46 TestScreen* test_screen() { return helper_->test_screen(); }
47 47
48 private: 48 private:
49 bool setup_called_; 49 bool setup_called_;
50 bool teardown_called_; 50 bool teardown_called_;
51 base::MessageLoopForUI message_loop_; 51 base::MessageLoopForUI message_loop_;
52 scoped_ptr<AuraTestHelper> helper_; 52 std::unique_ptr<AuraTestHelper> helper_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(AuraTestBase); 54 DISALLOW_COPY_AND_ASSIGN(AuraTestBase);
55 }; 55 };
56 56
57 } // namespace test 57 } // namespace test
58 } // namespace aura 58 } // namespace aura
59 59
60 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ 60 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ui/aura/scoped_window_targeter.cc ('k') | ui/aura/test/aura_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698