Chromium Code Reviews| Index: ui/base/clipboard/clipboard_aurax11.cc |
| diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc |
| index 8c7605e2e0b8d92d7a5a8933552927df9daba592..baa33c58394d43563d61dc1fad624e9b6c290660 100644 |
| --- a/ui/base/clipboard/clipboard_aurax11.cc |
| +++ b/ui/base/clipboard/clipboard_aurax11.cc |
| @@ -46,20 +46,18 @@ const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste"; |
| const char kSaveTargets[] = "SAVE_TARGETS"; |
| const char kTargets[] = "TARGETS"; |
| -const char* kAtomsToCache[] = { |
| - kClipboard, |
| - kClipboardManager, |
| - Clipboard::kMimeTypePNG, |
| - kMimeTypeFilename, |
| - kMimeTypeMozillaURL, |
| - kMimeTypeWebkitSmartPaste, |
| - kSaveTargets, |
| - kString, |
| - kTargets, |
| - kText, |
| - kUtf8String, |
| - NULL |
| -}; |
| +const char* kAtomsToCache[] = {kClipboard, |
| + kClipboardManager, |
| + Clipboard::kMimeTypePNG, |
| + kMimeTypeFilename, |
| + Clipboard::kMimeTypeMozillaURL, |
| + kMimeTypeWebkitSmartPaste, |
| + kSaveTargets, |
| + kString, |
| + kTargets, |
| + kText, |
| + kUtf8String, |
| + NULL}; |
|
sky
2016/05/26 23:10:27
while you're here, nullptr
|
| /////////////////////////////////////////////////////////////////////////////// |
| @@ -597,6 +595,12 @@ const Clipboard::FormatType& Clipboard::GetUrlWFormatType() { |
| } |
| // static |
| +const Clipboard::FormatType& Clipboard::GetMozUrlFormatType() { |
| + CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeMozillaURL)); |
| + return type; |
| +} |
| + |
| +// static |
| const Clipboard::FormatType& Clipboard::GetPlainTextFormatType() { |
| CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypeText)); |
| return type; |