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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_aurax11.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/dragdrop/os_exchange_data_provider_aura.h ('k') | ui/base/dragdrop/os_exchange_data_provider_mac.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_provider_aurax11.h
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
index 4d6a95f65694f8b2846f05734dd1823e477e1cf2..959b6a68aa1ee048a4c4c28410d7db6aade207e4 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
@@ -69,7 +69,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
void SetFilename(const base::FilePath& path) override;
void SetFilenames(const std::vector<FileInfo>& filenames) override;
void SetPickledData(const OSExchangeData::CustomFormat& format,
- const Pickle& pickle) override;
+ const base::Pickle& pickle) override;
bool GetString(base::string16* data) const override;
bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
GURL* url,
@@ -77,7 +77,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
bool GetFilename(base::FilePath* path) const override;
bool GetFilenames(std::vector<FileInfo>* filenames) const override;
bool GetPickledData(const OSExchangeData::CustomFormat& format,
- Pickle* pickle) const override;
+ base::Pickle* pickle) const override;
bool HasString() const override;
bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const override;
bool HasFile() const override;
@@ -101,7 +101,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
private:
friend class OSExchangeDataProviderAuraX11Test;
- typedef std::map<OSExchangeData::CustomFormat, Pickle> PickleData;
+ typedef std::map<OSExchangeData::CustomFormat, base::Pickle> PickleData;
// Returns true if |formats_| contains a string format and the string can be
// parsed as a URL.
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aura.h ('k') | ui/base/dragdrop/os_exchange_data_provider_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698