| Index: ui/base/clipboard/clipboard_aurax11.cc
|
| diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
|
| index 4588cc9564d652428536dcc2ca514e159528b282..2ea2729c702748a2e553d3632971212d7cfb484c 100644
|
| --- a/ui/base/clipboard/clipboard_aurax11.cc
|
| +++ b/ui/base/clipboard/clipboard_aurax11.cc
|
| @@ -791,7 +791,7 @@ void Clipboard::WriteData(const FormatType& format,
|
| }
|
|
|
| // static
|
| -Clipboard::FormatType Clipboard::GetFormatType(
|
| +Clipboard::FormatType Clipboard::GetFormatTypeInternal(
|
| const std::string& format_string) {
|
| return FormatType::Deserialize(format_string);
|
| }
|
| @@ -855,13 +855,15 @@ const Clipboard::FormatType& Clipboard::GetWebKitSmartPasteFormatType() {
|
|
|
| // static
|
| const Clipboard::FormatType& Clipboard::GetWebCustomDataFormatType() {
|
| - CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeWebCustomData));
|
| + CR_DEFINE_STATIC_LOCAL(
|
| + FormatType, type, (GetFormatType(kMimeTypeWebCustomData)));
|
| return type;
|
| }
|
|
|
| // static
|
| const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
|
| - CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
|
| + CR_DEFINE_STATIC_LOCAL(
|
| + FormatType, type, (GetFormatType(kMimeTypePepperCustomData)));
|
| return type;
|
| }
|
|
|
|
|