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

Side by Side Diff: ui/views/widget/root_view.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/widget/native_widget_mac_unittest.mm ('k') | ui/views/widget/root_view.cc » ('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_VIEWS_WIDGET_ROOT_VIEW_H_ 5 #ifndef UI_VIEWS_WIDGET_ROOT_VIEW_H_
6 #define UI_VIEWS_WIDGET_ROOT_VIEW_H_ 6 #define UI_VIEWS_WIDGET_ROOT_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 View* gesture_handler_; 210 View* gesture_handler_;
211 211
212 // Used to indicate if the |gesture_handler_| member was set prior to the 212 // Used to indicate if the |gesture_handler_| member was set prior to the
213 // processing of the current event (i.e., if |gesture_handler_| was set 213 // processing of the current event (i.e., if |gesture_handler_| was set
214 // by the dispatch of a previous gesture event). 214 // by the dispatch of a previous gesture event).
215 // TODO(tdanderson): It may be possible to eliminate the need for this 215 // TODO(tdanderson): It may be possible to eliminate the need for this
216 // member if |event_dispatch_target_| can be used in 216 // member if |event_dispatch_target_| can be used in
217 // its place. 217 // its place.
218 bool gesture_handler_set_before_processing_; 218 bool gesture_handler_set_before_processing_;
219 219
220 scoped_ptr<internal::PreEventDispatchHandler> pre_dispatch_handler_; 220 std::unique_ptr<internal::PreEventDispatchHandler> pre_dispatch_handler_;
221 scoped_ptr<internal::PostEventDispatchHandler> post_dispatch_handler_; 221 std::unique_ptr<internal::PostEventDispatchHandler> post_dispatch_handler_;
222 222
223 // Focus --------------------------------------------------------------------- 223 // Focus ---------------------------------------------------------------------
224 224
225 // The focus search algorithm. 225 // The focus search algorithm.
226 FocusSearch focus_search_; 226 FocusSearch focus_search_;
227 227
228 // Whether this root view belongs to the current active window. 228 // Whether this root view belongs to the current active window.
229 // bool activated_; 229 // bool activated_;
230 230
231 // The parent FocusTraversable, used for focus traversal. 231 // The parent FocusTraversable, used for focus traversal.
(...skipping 11 matching lines...) Expand all
243 // Tracks drag state for a view. 243 // Tracks drag state for a view.
244 View::DragInfo drag_info_; 244 View::DragInfo drag_info_;
245 245
246 DISALLOW_IMPLICIT_CONSTRUCTORS(RootView); 246 DISALLOW_IMPLICIT_CONSTRUCTORS(RootView);
247 }; 247 };
248 248
249 } // namespace internal 249 } // namespace internal
250 } // namespace views 250 } // namespace views
251 251
252 #endif // UI_VIEWS_WIDGET_ROOT_VIEW_H_ 252 #endif // UI_VIEWS_WIDGET_ROOT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_mac_unittest.mm ('k') | ui/views/widget/root_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698