| Index: ui/base/clipboard/clipboard_aurax11.cc
|
| diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
|
| index f27c4e235add5144e4459d509e39fd4a0d90593e..8c7605e2e0b8d92d7a5a8933552927df9daba592 100644
|
| --- a/ui/base/clipboard/clipboard_aurax11.cc
|
| +++ b/ui/base/clipboard/clipboard_aurax11.cc
|
| @@ -41,21 +41,25 @@
|
| const char kClipboard[] = "CLIPBOARD";
|
| const char kClipboardManager[] = "CLIPBOARD_MANAGER";
|
| const char kMimeTypeFilename[] = "chromium/filename";
|
| +const char kMimeTypePepperCustomData[] = "chromium/x-pepper-custom-data";
|
| +const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste";
|
| const char kSaveTargets[] = "SAVE_TARGETS";
|
| const char kTargets[] = "TARGETS";
|
|
|
| -const char* kAtomsToCache[] = {kClipboard,
|
| - kClipboardManager,
|
| - Clipboard::kMimeTypePNG,
|
| - kMimeTypeFilename,
|
| - Clipboard::kMimeTypeMozillaURL,
|
| - Clipboard::kMimeTypeWebkitSmartPaste,
|
| - kSaveTargets,
|
| - kString,
|
| - kTargets,
|
| - kText,
|
| - kUtf8String,
|
| - nullptr};
|
| +const char* kAtomsToCache[] = {
|
| + kClipboard,
|
| + kClipboardManager,
|
| + Clipboard::kMimeTypePNG,
|
| + kMimeTypeFilename,
|
| + kMimeTypeMozillaURL,
|
| + kMimeTypeWebkitSmartPaste,
|
| + kSaveTargets,
|
| + kString,
|
| + kTargets,
|
| + kText,
|
| + kUtf8String,
|
| + NULL
|
| +};
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| @@ -593,12 +597,6 @@
|
| }
|
|
|
| // 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;
|
|
|