Commit d951b4de authored by Hazim Mohamed's avatar Hazim Mohamed Committed by Commit Bot

Clipboard: Make DataSource enum an enum class.

No intended logic change.

Change-Id: I569f05fe409ef57078d6d24c34e183889405fd2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2265132
Commit-Queue: Hazim Mohamed <hazimmohamed@google.com>
Reviewed-by: default avatarDarwin Huang <huangdarwin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782783}
parent e8d6580b
...@@ -120,7 +120,7 @@ DataObjectItem* DataObjectItem::CreateFromClipboard( ...@@ -120,7 +120,7 @@ DataObjectItem* DataObjectItem::CreateFromClipboard(
} }
DataObjectItem::DataObjectItem(ItemKind kind, const String& type) DataObjectItem::DataObjectItem(ItemKind kind, const String& type)
: source_(kInternalSource), : source_(DataSource::kInternalSource),
kind_(kind), kind_(kind),
type_(type), type_(type),
sequence_number_(0), sequence_number_(0),
...@@ -130,7 +130,7 @@ DataObjectItem::DataObjectItem(ItemKind kind, ...@@ -130,7 +130,7 @@ DataObjectItem::DataObjectItem(ItemKind kind,
const String& type, const String& type,
uint64_t sequence_number, uint64_t sequence_number,
SystemClipboard* system_clipboard) SystemClipboard* system_clipboard)
: source_(kClipboardSource), : source_(DataSource::kClipboardSource),
kind_(kind), kind_(kind),
type_(type), type_(type),
sequence_number_(sequence_number), sequence_number_(sequence_number),
...@@ -142,7 +142,7 @@ File* DataObjectItem::GetAsFile() const { ...@@ -142,7 +142,7 @@ File* DataObjectItem::GetAsFile() const {
if (Kind() != kFileKind) if (Kind() != kFileKind)
return nullptr; return nullptr;
if (source_ == kInternalSource) { if (source_ == DataSource::kInternalSource) {
if (file_) if (file_)
return file_.Get(); return file_.Get();
DCHECK(shared_buffer_); DCHECK(shared_buffer_);
...@@ -152,7 +152,7 @@ File* DataObjectItem::GetAsFile() const { ...@@ -152,7 +152,7 @@ File* DataObjectItem::GetAsFile() const {
return nullptr; return nullptr;
} }
DCHECK_EQ(source_, kClipboardSource); DCHECK_EQ(source_, DataSource::kClipboardSource);
if (GetType() == kMimeTypeImagePng) { if (GetType() == kMimeTypeImagePng) {
SkBitmap bitmap = SkBitmap bitmap =
system_clipboard_->ReadImage(mojom::ClipboardBuffer::kStandard); system_clipboard_->ReadImage(mojom::ClipboardBuffer::kStandard);
...@@ -184,10 +184,10 @@ File* DataObjectItem::GetAsFile() const { ...@@ -184,10 +184,10 @@ File* DataObjectItem::GetAsFile() const {
String DataObjectItem::GetAsString() const { String DataObjectItem::GetAsString() const {
DCHECK_EQ(kind_, kStringKind); DCHECK_EQ(kind_, kStringKind);
if (source_ == kInternalSource) if (source_ == DataSource::kInternalSource)
return data_; return data_;
DCHECK_EQ(source_, kClipboardSource); DCHECK_EQ(source_, DataSource::kClipboardSource);
String data; String data;
// This is ugly but there's no real alternative. // This is ugly but there's no real alternative.
......
...@@ -92,7 +92,7 @@ class CORE_EXPORT DataObjectItem final ...@@ -92,7 +92,7 @@ class CORE_EXPORT DataObjectItem final
void Trace(Visitor*) const; void Trace(Visitor*) const;
private: private:
enum DataSource { enum class DataSource {
kClipboardSource, kClipboardSource,
kInternalSource, kInternalSource,
}; };
...@@ -109,7 +109,8 @@ class CORE_EXPORT DataObjectItem final ...@@ -109,7 +109,8 @@ class CORE_EXPORT DataObjectItem final
String title_; String title_;
KURL base_url_; KURL base_url_;
uint64_t sequence_number_; // Only valid when |source_| == PasteboardSource. uint64_t sequence_number_; // Only valid when |source_| ==
// DataSource::kClipboardSource.
String file_system_id_; // Only valid when |file_| is backed by FileEntry. String file_system_id_; // Only valid when |file_| is backed by FileEntry.
// Access to the global system clipboard. // Access to the global system clipboard.
......
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