| Index: ui/base/clipboard/clipboard_win.cc
|
| diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
|
| index e97ca07f817d7b7ec47cd106f95c5063fcecbbb3..1f408404d6b7b76e05dca22cdc7b5be566b3ca98 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;
|
| }
|
|
|
|
|