Commit 62baf080 authored by Darwin Huang's avatar Darwin Huang Committed by Commit Bot

Clipboard: Remove obsolete pepper format.

Remove dead code. The class previously using this format,
PepperFlashClipboardMessageFilter, has been removed.

Change-Id: If83e3398555ba62eb7c4934c60758e464c6590d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511410
Commit-Queue: Victor Costan <pwnall@chromium.org>
Auto-Submit: Darwin Huang <huangdarwin@chromium.org>
Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822988}
parent b4f59bab
......@@ -25,7 +25,6 @@ const char kMimeTypeLinuxText[] = "TEXT";
#if !defined(OS_APPLE)
const char kMimeTypeWebCustomData[] = "chromium/x-web-custom-data";
const char kMimeTypeWebkitSmartPaste[] = "chromium/x-webkit-paste";
const char kMimeTypePepperCustomData[] = "chromium/x-pepper-custom-data";
#endif // defined(OS_APPLE)
#if defined(OS_ANDROID)
......
......@@ -52,8 +52,6 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
extern const char kMimeTypeWebCustomData[];
COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
extern const char kMimeTypeWebkitSmartPaste[];
COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
extern const char kMimeTypePepperCustomData[];
#else
// MacOS-specific Uniform Type Identifiers.
......@@ -70,10 +68,6 @@ extern NSString* const kWebCustomDataPboardType;
COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
extern NSString* const kWebSmartPastePboardType;
// Pepper custom data format type.
COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
extern NSString* const kPepperCustomDataPboardType;
// Data format used to tag the current data as confidential.
COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES)
extern NSString* const kUTTypeConfidentialData;
......
......@@ -12,8 +12,6 @@ NSString* const kImageSvg = @"public.svg-image";
// TODO(dcheng): This name is temporary. See crbug.com/106449.
NSString* const kWebCustomDataPboardType = @"org.chromium.web-custom-data";
NSString* const kWebSmartPastePboardType = @"NeXT smart paste pasteboard type";
NSString* const kPepperCustomDataPboardType =
@"org.chromium.pepper-custom-data";
// It is the common convention on the Mac and on iOS that password managers tag
// confidential data with the flavor "org.nspasteboard.ConcealedType". Obey this
......
......@@ -62,10 +62,7 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
static const ClipboardFormatType& GetSvgType();
static const ClipboardFormatType& GetRtfType();
static const ClipboardFormatType& GetBitmapType();
// TODO(raymes): Unify web custom data and pepper custom data:
// crbug.com/158399.
static const ClipboardFormatType& GetWebCustomDataType();
static const ClipboardFormatType& GetPepperCustomDataType();
#if defined(OS_WIN)
// ANSI formats. Only Windows differentiates between ANSI and UNICODE formats
......
......@@ -95,11 +95,4 @@ const ClipboardFormatType& ClipboardFormatType::GetWebCustomDataType() {
return *type;
}
// static
const ClipboardFormatType& ClipboardFormatType::GetPepperCustomDataType() {
static base::NoDestructor<ClipboardFormatType> type(
kMimeTypePepperCustomData);
return *type;
}
} // namespace ui
......@@ -98,11 +98,4 @@ const ClipboardFormatType& ClipboardFormatType::GetWebCustomDataType() {
return *type;
}
// static
const ClipboardFormatType& ClipboardFormatType::GetPepperCustomDataType() {
static base::NoDestructor<ClipboardFormatType> type(
kMimeTypePepperCustomData);
return *type;
}
} // namespace ui
......@@ -110,11 +110,4 @@ const ClipboardFormatType& ClipboardFormatType::GetWebCustomDataType() {
return *type;
}
// static
const ClipboardFormatType& ClipboardFormatType::GetPepperCustomDataType() {
static base::NoDestructor<ClipboardFormatType> type(
kPepperCustomDataPboardType);
return *type;
}
} // namespace ui
......@@ -333,11 +333,4 @@ const ClipboardFormatType& ClipboardFormatType::GetWebCustomDataType() {
return *format;
}
// static
const ClipboardFormatType& ClipboardFormatType::GetPepperCustomDataType() {
static base::NoDestructor<ClipboardFormatType> format(
::RegisterClipboardFormat(L"Chromium Pepper MIME Data Format"));
return *format;
}
} // namespace ui
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment