| Index: ui/base/clipboard/clipboard_aura.cc
|
| diff --git a/ui/base/clipboard/clipboard_aura.cc b/ui/base/clipboard/clipboard_aura.cc
|
| index 30b639a90767edef69c5d5242e6157e1ba84263b..097d72184479f9ef7ebdc7b558d60b3f89bb8c5c 100644
|
| --- a/ui/base/clipboard/clipboard_aura.cc
|
| +++ b/ui/base/clipboard/clipboard_aura.cc
|
| @@ -601,7 +601,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);
|
| }
|
| @@ -665,13 +665,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;
|
| }
|
|
|
|
|