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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_win.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_mac.h ('k') | ui/gfx/ipc/gfx_param_traits.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_win.h
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index 59479ac547ad64e35426841d6b8c159a98dbd897..21304e58a5c0623fa2c47fa3ace6617dd9695cd6 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -152,7 +152,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
void SetFilename(const base::FilePath& path) override;
void SetFilenames(const std::vector<FileInfo>& filenames) override;
void SetPickledData(const OSExchangeData::CustomFormat& format,
- const Pickle& data) override;
+ const base::Pickle& data) override;
void SetFileContents(const base::FilePath& filename,
const std::string& file_contents) override;
void SetHtml(const base::string16& html, const GURL& base_url) override;
@@ -164,7 +164,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
bool GetFilename(base::FilePath* path) const override;
bool GetFilenames(std::vector<FileInfo>* filenames) const override;
bool GetPickledData(const OSExchangeData::CustomFormat& format,
- Pickle* data) const override;
+ base::Pickle* data) const override;
bool GetFileContents(base::FilePath* filename,
std::string* file_contents) const override;
bool GetHtml(base::string16* html, GURL* base_url) const override;
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_mac.h ('k') | ui/gfx/ipc/gfx_param_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698