From eaaaa0a7db219a6ba4a6df19e5f7fe4211cc6d81 Mon Sep 17 00:00:00 2001 From: Darwin Huang Date: Tue, 14 May 2019 00:23:23 +0000 Subject: [PATCH] ui/base/clipboard: Use default constructors Ref: https://abseil.io/tips/131 https: //stackoverflow.com/questions/20828907/the-new-keyword-default-in-c11?lq=1 Change-Id: I10dffd5bd13d6f619e4f758ec154947bbef86d0b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1607185 Commit-Queue: Scott Violet Auto-Submit: Darwin Huang Reviewed-by: Scott Violet Cr-Commit-Position: refs/heads/master@{#659299} --- ui/base/clipboard/clipboard.h | 4 ++-- ui/base/clipboard/clipboard_aura.cc | 4 ++-- ui/base/clipboard/clipboard_format_type_android.cc | 4 ++-- ui/base/clipboard/clipboard_format_type_win.cc | 4 ++-- ui/base/clipboard/clipboard_monitor.cc | 2 +- ui/base/clipboard/clipboard_observer.h | 2 +- ui/base/clipboard/clipboard_test_template.h | 2 +- ui/base/clipboard/test/test_clipboard.cc | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h index 913149dbd93edd..4972b88d81a953 100644 --- a/ui/base/clipboard/clipboard.h +++ b/ui/base/clipboard/clipboard.h @@ -146,8 +146,8 @@ class COMPONENT_EXPORT(BASE_CLIPBOARD) Clipboard : public base::ThreadChecker { protected: static Clipboard* Create(); - Clipboard() {} - virtual ~Clipboard() {} + Clipboard() = default; + virtual ~Clipboard() = default; // ObjectType designates the type of data to be stored in the clipboard. This // designation is shared across all OSes. The system-specific designation diff --git a/ui/base/clipboard/clipboard_aura.cc b/ui/base/clipboard/clipboard_aura.cc index 653b3ac1f6aef5..478070840ff016 100644 --- a/ui/base/clipboard/clipboard_aura.cc +++ b/ui/base/clipboard/clipboard_aura.cc @@ -50,7 +50,7 @@ class ClipboardData { : web_smart_paste_(false), format_(0) {} - virtual ~ClipboardData() {} + virtual ~ClipboardData() = default; // Bitmask of AuraClipboardFormat types. int format() const { return format_; } @@ -164,7 +164,7 @@ class AuraClipboard { AuraClipboard() : sequence_number_(0) { } - ~AuraClipboard() {} + ~AuraClipboard() = default; void Clear() { sequence_number_++; diff --git a/ui/base/clipboard/clipboard_format_type_android.cc b/ui/base/clipboard/clipboard_format_type_android.cc index 74a6e3f4b52456..e241d16009bfa9 100644 --- a/ui/base/clipboard/clipboard_format_type_android.cc +++ b/ui/base/clipboard/clipboard_format_type_android.cc @@ -22,12 +22,12 @@ const char kBookmarkFormat[] = "bookmark"; } // namespace // ClipboardFormatType implementation. -ClipboardFormatType::ClipboardFormatType() {} +ClipboardFormatType::ClipboardFormatType() = default; ClipboardFormatType::ClipboardFormatType(const std::string& native_format) : data_(native_format) {} -ClipboardFormatType::~ClipboardFormatType() {} +ClipboardFormatType::~ClipboardFormatType() = default; std::string ClipboardFormatType::Serialize() const { return data_; diff --git a/ui/base/clipboard/clipboard_format_type_win.cc b/ui/base/clipboard/clipboard_format_type_win.cc index a3bd4d1d4a1102..129ef0c119d656 100644 --- a/ui/base/clipboard/clipboard_format_type_win.cc +++ b/ui/base/clipboard/clipboard_format_type_win.cc @@ -15,7 +15,7 @@ namespace ui { // ClipboardFormatType implementation. -ClipboardFormatType::ClipboardFormatType() {} +ClipboardFormatType::ClipboardFormatType() = default; ClipboardFormatType::ClipboardFormatType(UINT native_format) { // There's no good way to actually initialize this in the constructor in @@ -47,7 +47,7 @@ ClipboardFormatType::ClipboardFormatType(UINT native_format, data_.tymed = tymed; } -ClipboardFormatType::~ClipboardFormatType() {} +ClipboardFormatType::~ClipboardFormatType() = default; std::string ClipboardFormatType::Serialize() const { return base::NumberToString(data_.cfFormat); diff --git a/ui/base/clipboard/clipboard_monitor.cc b/ui/base/clipboard/clipboard_monitor.cc index e9e8cbe79606d0..b8bd0944d8ae64 100644 --- a/ui/base/clipboard/clipboard_monitor.cc +++ b/ui/base/clipboard/clipboard_monitor.cc @@ -9,7 +9,7 @@ namespace ui { -ClipboardMonitor::ClipboardMonitor() {} +ClipboardMonitor::ClipboardMonitor() = default; ClipboardMonitor::~ClipboardMonitor() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); diff --git a/ui/base/clipboard/clipboard_observer.h b/ui/base/clipboard/clipboard_observer.h index 1aa813d63e6ed8..99c1c5bdc01a6e 100644 --- a/ui/base/clipboard/clipboard_observer.h +++ b/ui/base/clipboard/clipboard_observer.h @@ -17,7 +17,7 @@ class COMPONENT_EXPORT(BASE_CLIPBOARD) ClipboardObserver { virtual void OnClipboardDataChanged() = 0; protected: - virtual ~ClipboardObserver() {} + virtual ~ClipboardObserver() = default; }; } // namespace ui diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h index f81607b4bd866e..c0ee5e19765c4c 100644 --- a/ui/base/clipboard/clipboard_test_template.h +++ b/ui/base/clipboard/clipboard_test_template.h @@ -59,7 +59,7 @@ namespace ui { template class ClipboardTest : public PlatformTest { public: - ClipboardTest() {} + ClipboardTest() = default; ~ClipboardTest() override = default; // PlatformTest: diff --git a/ui/base/clipboard/test/test_clipboard.cc b/ui/base/clipboard/test/test_clipboard.cc index 09c74bb49eb92b..0bdc62bc6ef6c5 100644 --- a/ui/base/clipboard/test/test_clipboard.cc +++ b/ui/base/clipboard/test/test_clipboard.cc @@ -17,7 +17,7 @@ namespace ui { TestClipboard::TestClipboard() : default_store_type_(CLIPBOARD_TYPE_COPY_PASTE) {} -TestClipboard::~TestClipboard() {} +TestClipboard::~TestClipboard() = default; Clipboard* TestClipboard::CreateForCurrentThread() { base::AutoLock lock(Clipboard::clipboard_map_lock_.Get()); @@ -208,7 +208,7 @@ TestClipboard::DataStore::DataStore() : sequence_number(0) {} TestClipboard::DataStore::DataStore(const DataStore& other) = default; -TestClipboard::DataStore::~DataStore() {} +TestClipboard::DataStore::~DataStore() = default; void TestClipboard::DataStore::Clear() { data.clear();