diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 03:16:55 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 03:16:55 +0000 |
| commit | edc1250e0cf03038db503086dfd31082ed694d69 (patch) | |
| tree | 7a4c49bf6e92a772a27d1aa048cb24a501b19af9 /ui/base/clipboard/clipboard_win.cc | |
| parent | 1ab5bdd0ca665f2135b0e93dbf4c6e7051348b53 (diff) | |
| download | chromium_src-edc1250e0cf03038db503086dfd31082ed694d69.zip chromium_src-edc1250e0cf03038db503086dfd31082ed694d69.tar.gz chromium_src-edc1250e0cf03038db503086dfd31082ed694d69.tar.bz2 | |
Verify FormatType in ScopedClipboardWriter::WritePickledData.
BUG=352395
R=tony@chromium.org
TBR=sky@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256974
Review URL: https://codereview.chromium.org/199763002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/clipboard/clipboard_win.cc')
| -rw-r--r-- | ui/base/clipboard/clipboard_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index e97ca07..1f40840 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -677,7 +677,7 @@ void Clipboard::ParseBookmarkClipboardFormat(const base::string16& bookmark, } // static -Clipboard::FormatType Clipboard::GetFormatType( +Clipboard::FormatType Clipboard::GetFormatTypeInternal( const std::string& format_string) { return FormatType( ::RegisterClipboardFormat(base::ASCIIToWide(format_string).c_str())); @@ -802,7 +802,7 @@ const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType() { CR_DEFINE_STATIC_LOCAL( FormatType, type, - (::RegisterClipboardFormat(L"Chromium Web Custom MIME Data Format"))); + (GetFormatType("Chromium Web Custom MIME Data Format"))); return type; } @@ -811,7 +811,7 @@ const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() { CR_DEFINE_STATIC_LOCAL( FormatType, type, - (::RegisterClipboardFormat(L"Chromium Pepper MIME Data Format"))); + (GetFormatType("Chromium Pepper MIME Data Format"))); return type; } |