Commit 4654aa36 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Revert "Use use_x11 feature when preprocessing clipboard.mojom."

This reverts commit e4542cf9.

Reason for revert: Broke Chrome OS.

Original change's description:
> Use use_x11 feature when preprocessing clipboard.mojom.
> 
> The |kSelection| enum value is only available for systems running X11.
> 
> Bug: 676224
> Change-Id: Icdd99c86712d6127a6ae81e74d17b189073e11ed
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2163637
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Reviewed-by: Darwin Huang <huangdarwin@chromium.org>
> Commit-Queue: Lei Zhang <thestig@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#762479}

TBR=dcheng@chromium.org,thestig@chromium.org,huangdarwin@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 676224,1088233
Change-Id: I7ddf3dd99e78d0e5128691d3ef310d09ed848ce6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225846Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774291}
parent 27de57ae
...@@ -241,10 +241,6 @@ mojom("mojom_platform") { ...@@ -241,10 +241,6 @@ mojom("mojom_platform") {
enabled_features = [ "renderer_pref_system_font_family_name" ] enabled_features = [ "renderer_pref_system_font_family_name" ]
} }
if (use_x11) {
enabled_features += [ "use_x11" ]
}
shared_cpp_typemaps = [ shared_cpp_typemaps = [
{ {
types = [ types = [
......
...@@ -20,7 +20,8 @@ enum ClipboardBuffer { ...@@ -20,7 +20,8 @@ enum ClipboardBuffer {
kStandard, kStandard,
// Used on platforms like the X Window System that treat selection // Used on platforms like the X Window System that treat selection
// as a type of clipboard. // as a type of clipboard.
[EnableIf=use_x11] // TODO(crbug.com/676224): When preprocessing of mojom is available only
// define this value for USE_X11.
kSelection, kSelection,
}; };
......
...@@ -40,18 +40,12 @@ SystemClipboard::SystemClipboard(LocalFrame* frame) ...@@ -40,18 +40,12 @@ SystemClipboard::SystemClipboard(LocalFrame* frame)
} }
bool SystemClipboard::IsSelectionMode() const { bool SystemClipboard::IsSelectionMode() const {
#if defined(USE_X11)
return buffer_ == mojom::ClipboardBuffer::kSelection; return buffer_ == mojom::ClipboardBuffer::kSelection;
#else
return false;
#endif
} }
void SystemClipboard::SetSelectionMode(bool selection_mode) { void SystemClipboard::SetSelectionMode(bool selection_mode) {
#if defined(USE_X11)
buffer_ = selection_mode ? mojom::ClipboardBuffer::kSelection buffer_ = selection_mode ? mojom::ClipboardBuffer::kSelection
: mojom::ClipboardBuffer::kStandard; : mojom::ClipboardBuffer::kStandard;
#endif
} }
bool SystemClipboard::CanSmartReplace() { bool SystemClipboard::CanSmartReplace() {
...@@ -249,12 +243,17 @@ bool SystemClipboard::IsValidBufferType(mojom::ClipboardBuffer buffer) { ...@@ -249,12 +243,17 @@ bool SystemClipboard::IsValidBufferType(mojom::ClipboardBuffer buffer) {
switch (buffer) { switch (buffer) {
case mojom::ClipboardBuffer::kStandard: case mojom::ClipboardBuffer::kStandard:
return true; return true;
#if defined(USE_X11)
case mojom::ClipboardBuffer::kSelection: case mojom::ClipboardBuffer::kSelection:
#if defined(USE_X11)
return true; return true;
#else
// Chrome OS and non-X11 unix builds do not support
// the X selection clipboard.
// TODO(http://crbug.com/361753): remove the need for this case.
return false;
#endif #endif
} }
return false; return true;
} }
} // namespace blink } // namespace blink
...@@ -35,7 +35,7 @@ class CORE_EXPORT SystemClipboard final ...@@ -35,7 +35,7 @@ class CORE_EXPORT SystemClipboard final
explicit SystemClipboard(LocalFrame* frame); explicit SystemClipboard(LocalFrame* frame);
uint64_t SequenceNumber(); uint64_t SequenceNumber();
bool IsSelectionMode() const; bool IsSelectionMode() const;
void SetSelectionMode(bool selection_mode); void SetSelectionMode(bool);
bool CanSmartReplace(); bool CanSmartReplace();
bool IsHTMLAvailable(); bool IsHTMLAvailable();
Vector<String> ReadAvailableTypes(); Vector<String> ReadAvailableTypes();
......
...@@ -25,10 +25,12 @@ struct EnumTraits<blink::mojom::ClipboardBuffer, ui::ClipboardBuffer> { ...@@ -25,10 +25,12 @@ struct EnumTraits<blink::mojom::ClipboardBuffer, ui::ClipboardBuffer> {
case blink::mojom::ClipboardBuffer::kStandard: case blink::mojom::ClipboardBuffer::kStandard:
*out = ui::ClipboardBuffer::kCopyPaste; *out = ui::ClipboardBuffer::kCopyPaste;
return true; return true;
#if defined(USE_X11)
case blink::mojom::ClipboardBuffer::kSelection: case blink::mojom::ClipboardBuffer::kSelection:
#if defined(USE_X11)
*out = ui::ClipboardBuffer::kSelection; *out = ui::ClipboardBuffer::kSelection;
return true; return true;
#else
return false;
#endif #endif
} }
return false; return false;
......
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