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

Side by Side Diff: ui/views/test/views_test_helper_aura.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/views/test/views_test_base.h ('k') | ui/views/test/views_test_helper_mac.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ 6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "ui/views/test/views_test_helper.h" 12 #include "ui/views/test/views_test_helper.h"
12 13
13 namespace aura { 14 namespace aura {
14 namespace client { 15 namespace client {
15 class ScreenPositionClient; 16 class ScreenPositionClient;
16 } 17 }
17 namespace test { 18 namespace test {
18 class AuraTestHelper; 19 class AuraTestHelper;
19 } 20 }
20 } 21 }
(...skipping 14 matching lines...) Expand all
35 ui::ContextFactory* context_factory); 36 ui::ContextFactory* context_factory);
36 ~ViewsTestHelperAura() override; 37 ~ViewsTestHelperAura() override;
37 38
38 // Overridden from ViewsTestHelper: 39 // Overridden from ViewsTestHelper:
39 void SetUp() override; 40 void SetUp() override;
40 void TearDown() override; 41 void TearDown() override;
41 gfx::NativeWindow GetContext() override; 42 gfx::NativeWindow GetContext() override;
42 43
43 private: 44 private:
44 ui::ContextFactory* context_factory_; 45 ui::ContextFactory* context_factory_;
45 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; 46 std::unique_ptr<aura::test::AuraTestHelper> aura_test_helper_;
46 scoped_ptr<wm::WMState> wm_state_; 47 std::unique_ptr<wm::WMState> wm_state_;
47 scoped_ptr<aura::client::ScreenPositionClient> screen_position_client_; 48 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
48 49
49 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura); 50 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura);
50 }; 51 };
51 52
52 } // namespace views 53 } // namespace views
53 54
54 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ 55 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/test/views_test_base.h ('k') | ui/views/test/views_test_helper_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698