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

Side by Side Diff: content/browser/web_contents/web_contents_view_mac.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory>
10 #include <string> 11 #include <string>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/mac/scoped_nsobject.h" 14 #include "base/mac/scoped_nsobject.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 16 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
17 #include "content/browser/web_contents/web_contents_view.h" 17 #include "content/browser/web_contents/web_contents_view.h"
18 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
19 #include "content/common/drag_event_source_info.h" 19 #include "content/common/drag_event_source_info.h"
20 #include "ui/base/cocoa/base_view.h" 20 #include "ui/base/cocoa/base_view.h"
21 #include "ui/gfx/geometry/size.h" 21 #include "ui/gfx/geometry/size.h"
22 22
23 @class FocusTracker; 23 @class FocusTracker;
24 class SkBitmap; 24 class SkBitmap;
25 @class WebDragDest; 25 @class WebDragDest;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 WebContentsImpl* web_contents_; 137 WebContentsImpl* web_contents_;
138 138
139 // The Cocoa NSView that lives in the view hierarchy. 139 // The Cocoa NSView that lives in the view hierarchy.
140 base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_; 140 base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_;
141 141
142 // Keeps track of which NSView has focus so we can restore the focus when 142 // Keeps track of which NSView has focus so we can restore the focus when
143 // focus returns. 143 // focus returns.
144 base::scoped_nsobject<FocusTracker> focus_tracker_; 144 base::scoped_nsobject<FocusTracker> focus_tracker_;
145 145
146 // Our optional delegate. 146 // Our optional delegate.
147 scoped_ptr<WebContentsViewDelegate> delegate_; 147 std::unique_ptr<WebContentsViewDelegate> delegate_;
148 148
149 // Whether to allow other views. 149 // Whether to allow other views.
150 bool allow_other_views_; 150 bool allow_other_views_;
151 151
152 scoped_ptr<PopupMenuHelper> popup_menu_helper_; 152 std::unique_ptr<PopupMenuHelper> popup_menu_helper_;
153 153
154 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac); 154 DISALLOW_COPY_AND_ASSIGN(WebContentsViewMac);
155 }; 155 };
156 156
157 } // namespace content 157 } // namespace content
158 158
159 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ 159 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_guest.cc ('k') | content/browser/web_contents/web_contents_view_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698