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

Unified Diff: ui/base/dragdrop/os_exchange_data.h

Issue 1149113006: Move Pickle to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/clipboard/scoped_clipboard_writer.h ('k') | ui/base/dragdrop/os_exchange_data_provider_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dragdrop/os_exchange_data.h
diff --git a/ui/base/dragdrop/os_exchange_data.h b/ui/base/dragdrop/os_exchange_data.h
index 539e8949f9d371fbc124cd3a80cd8e96f67c34ec..55e8e5637b99b454bd9a6e813d7c50d108510dc4 100644
--- a/ui/base/dragdrop/os_exchange_data.h
+++ b/ui/base/dragdrop/os_exchange_data.h
@@ -22,7 +22,10 @@
#include "ui/base/ui_base_export.h"
class GURL;
+
+namespace base {
class Pickle;
+}
namespace gfx {
class ImageSkia;
@@ -100,7 +103,7 @@ class UI_BASE_EXPORT OSExchangeData {
virtual void SetFilenames(
const std::vector<FileInfo>& file_names) = 0;
virtual void SetPickledData(const CustomFormat& format,
- const Pickle& data) = 0;
+ const base::Pickle& data) = 0;
virtual bool GetString(base::string16* data) const = 0;
virtual bool GetURLAndTitle(FilenameToURLPolicy policy,
@@ -110,7 +113,7 @@ class UI_BASE_EXPORT OSExchangeData {
virtual bool GetFilenames(
std::vector<FileInfo>* file_names) const = 0;
virtual bool GetPickledData(const CustomFormat& format,
- Pickle* data) const = 0;
+ base::Pickle* data) const = 0;
virtual bool HasString() const = 0;
virtual bool HasURL(FilenameToURLPolicy policy) const = 0;
@@ -181,7 +184,7 @@ class UI_BASE_EXPORT OSExchangeData {
void SetFilenames(
const std::vector<FileInfo>& file_names);
// Adds pickled data of the specified format.
- void SetPickledData(const CustomFormat& format, const Pickle& data);
+ void SetPickledData(const CustomFormat& format, const base::Pickle& data);
// These functions retrieve data of the specified type. If data exists, the
// functions return and the result is in the out parameter. If the data does
@@ -195,7 +198,7 @@ class UI_BASE_EXPORT OSExchangeData {
bool GetFilename(base::FilePath* path) const;
bool GetFilenames(
std::vector<FileInfo>* file_names) const;
- bool GetPickledData(const CustomFormat& format, Pickle* data) const;
+ bool GetPickledData(const CustomFormat& format, base::Pickle* data) const;
// Test whether or not data of certain types is present, without actually
// returning anything.
« no previous file with comments | « ui/base/clipboard/scoped_clipboard_writer.h ('k') | ui/base/dragdrop/os_exchange_data_provider_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698