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

Side by Side Diff: ui/base/dragdrop/os_exchange_data.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/base/cursor/image_cursors.h ('k') | ui/base/dragdrop/os_exchange_data_unittest.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_BASE_DRAGDROP_OS_EXCHANGE_DATA_H_ 5 #ifndef UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_H_
6 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_H_ 6 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_H_
7 7
8 #include "build/build_config.h" 8 #include <memory>
9
10 #include <set> 9 #include <set>
11 #include <string> 10 #include <string>
12 11
12 #include "build/build_config.h"
13
13 #if defined(OS_WIN) 14 #if defined(OS_WIN)
14 #include <objidl.h> 15 #include <objidl.h>
15 #endif 16 #endif
16 17
17 #include "base/files/file_path.h" 18 #include "base/files/file_path.h"
18 #include "base/macros.h" 19 #include "base/macros.h"
19 #include "base/memory/scoped_ptr.h"
20 #include "ui/base/clipboard/clipboard.h" 20 #include "ui/base/clipboard/clipboard.h"
21 #include "ui/base/dragdrop/download_file_interface.h" 21 #include "ui/base/dragdrop/download_file_interface.h"
22 #include "ui/base/ui_base_export.h" 22 #include "ui/base/ui_base_export.h"
23 23
24 class GURL; 24 class GURL;
25 25
26 namespace base { 26 namespace base {
27 class Pickle; 27 class Pickle;
28 } 28 }
29 29
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 222
223 #if defined(USE_AURA) 223 #if defined(USE_AURA)
224 // Adds a snippet of HTML. |html| is just raw html but this sets both 224 // Adds a snippet of HTML. |html| is just raw html but this sets both
225 // text/html and CF_HTML. 225 // text/html and CF_HTML.
226 void SetHtml(const base::string16& html, const GURL& base_url); 226 void SetHtml(const base::string16& html, const GURL& base_url);
227 bool GetHtml(base::string16* html, GURL* base_url) const; 227 bool GetHtml(base::string16* html, GURL* base_url) const;
228 #endif 228 #endif
229 229
230 private: 230 private:
231 // Provides the actual data. 231 // Provides the actual data.
232 scoped_ptr<Provider> provider_; 232 std::unique_ptr<Provider> provider_;
233 233
234 DISALLOW_COPY_AND_ASSIGN(OSExchangeData); 234 DISALLOW_COPY_AND_ASSIGN(OSExchangeData);
235 }; 235 };
236 236
237 } // namespace ui 237 } // namespace ui
238 238
239 #endif // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_H_ 239 #endif // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_H_
OLDNEW
« no previous file with comments | « ui/base/cursor/image_cursors.h ('k') | ui/base/dragdrop/os_exchange_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698