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

Side by Side Diff: ui/views/test/test_views.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/scoped_views_test_helper.cc ('k') | ui/views/test/test_views_delegate.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef UI_VIEWS_TEST_TEST_VIEWS_H_ 5 #ifndef UI_VIEWS_TEST_TEST_VIEWS_H_
6 #define UI_VIEWS_TEST_TEST_VIEWS_H_ 6 #define UI_VIEWS_TEST_TEST_VIEWS_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/events/event_constants.h" 11 #include "ui/events/event_constants.h"
11 #include "ui/views/view.h" 12 #include "ui/views/view.h"
12 13
13 namespace views { 14 namespace views {
14 15
15 // A view that requests a set amount of space. 16 // A view that requests a set amount of space.
16 class StaticSizedView : public View { 17 class StaticSizedView : public View {
17 public: 18 public:
18 explicit StaticSizedView(const gfx::Size& size); 19 explicit StaticSizedView(const gfx::Size& size);
19 ~StaticSizedView() override; 20 ~StaticSizedView() override;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 std::map<ui::EventType, int> event_count_; 111 std::map<ui::EventType, int> event_count_;
111 int last_flags_; 112 int last_flags_;
112 HandleMode handle_mode_; 113 HandleMode handle_mode_;
113 114
114 DISALLOW_COPY_AND_ASSIGN(EventCountView); 115 DISALLOW_COPY_AND_ASSIGN(EventCountView);
115 }; 116 };
116 117
117 } // namespace views 118 } // namespace views
118 119
119 #endif // UI_VIEWS_TEST_TEST_VIEWS_H_ 120 #endif // UI_VIEWS_TEST_TEST_VIEWS_H_
OLDNEW
« no previous file with comments | « ui/views/test/scoped_views_test_helper.cc ('k') | ui/views/test/test_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698