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

Side by Side Diff: ui/views/widget/native_widget_mac.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_aura_unittest.cc ('k') | ui/views/widget/native_widget_mac.mm » ('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_WIDGET_NATIVE_WIDGET_MAC_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/gfx/native_widget_types.h" 9 #include "ui/gfx/native_widget_types.h"
10 #include "ui/views/widget/native_widget_private.h" 10 #include "ui/views/widget/native_widget_private.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 virtual NativeWidgetMacNSWindow* CreateNSWindow( 139 virtual NativeWidgetMacNSWindow* CreateNSWindow(
140 const Widget::InitParams& params); 140 const Widget::InitParams& params);
141 141
142 internal::NativeWidgetDelegate* delegate() { return delegate_; } 142 internal::NativeWidgetDelegate* delegate() { return delegate_; }
143 143
144 private: 144 private:
145 friend class test::MockNativeWidgetMac; 145 friend class test::MockNativeWidgetMac;
146 friend class test::HitTestNativeWidgetMac; 146 friend class test::HitTestNativeWidgetMac;
147 147
148 internal::NativeWidgetDelegate* delegate_; 148 internal::NativeWidgetDelegate* delegate_;
149 scoped_ptr<BridgedNativeWidget> bridge_; 149 std::unique_ptr<BridgedNativeWidget> bridge_;
150 150
151 Widget::InitParams::Ownership ownership_; 151 Widget::InitParams::Ownership ownership_;
152 152
153 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac); 153 DISALLOW_COPY_AND_ASSIGN(NativeWidgetMac);
154 }; 154 };
155 155
156 } // namespace views 156 } // namespace views
157 157
158 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_ 158 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_MAC_H_
OLDNEW
« no previous file with comments | « ui/views/widget/native_widget_aura_unittest.cc ('k') | ui/views/widget/native_widget_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698