Use =default to implement Accelerator copy operations.

Not only is this shorter, it fixes a bug where operator=() failed to
copy one of the members.

Bug: none
Change-Id: I778a093ac7e31e38319421b76a5c174cd8b7d5b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2213023
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771258}

ui/base/accelerators/accelerator.cc

@@ -135,17 +135,11 @@ Accelerator::Accelerator(const KeyEvent& key_event)
 #endif
 }
 
-Accelerator::Accelerator(const Accelerator& accelerator) {
-  key_code_ = accelerator.key_code_;
-  key_state_ = accelerator.key_state_;
-  modifiers_ = accelerator.modifiers_;
-  time_stamp_ = accelerator.time_stamp_;
-  interrupted_by_mouse_event_ = accelerator.interrupted_by_mouse_event_;
-  source_device_id_ = accelerator.source_device_id_;
-}
+Accelerator::Accelerator(const Accelerator& accelerator) = default;
 
-Accelerator::~Accelerator() {
-}
+Accelerator& Accelerator::operator=(const Accelerator& accelerator) = default;
+
+Accelerator::~Accelerator() = default;
 
 // static
 int Accelerator::MaskOutKeyEventFlags(int flags) {
@@ -159,17 +153,6 @@ KeyEvent Accelerator::ToKeyEvent() const {
                   key_code(), modifiers(), time_stamp());
 }
 
-Accelerator& Accelerator::operator=(const Accelerator& accelerator) {
-  if (this != &accelerator) {
-    key_code_ = accelerator.key_code_;
-    key_state_ = accelerator.key_state_;
-    modifiers_ = accelerator.modifiers_;
-    time_stamp_ = accelerator.time_stamp_;
-    interrupted_by_mouse_event_ = accelerator.interrupted_by_mouse_event_;
-  }
-  return *this;
-}
-
 bool Accelerator::operator <(const Accelerator& rhs) const {
   const int modifiers_with_mask = MaskOutKeyEventFlags(modifiers_);
   const int rhs_modifiers_with_mask = MaskOutKeyEventFlags(rhs.modifiers_);

ui/base/accelerators/accelerator.h

@@ -48,6 +48,7 @@ class UI_BASE_EXPORT Accelerator {
               base::TimeTicks time_stamp = base::TimeTicks());
   explicit Accelerator(const KeyEvent& key_event);
   Accelerator(const Accelerator& accelerator);
+  Accelerator& operator=(const Accelerator& accelerator);
   ~Accelerator();
 
   // Masks out all the non-modifiers KeyEvent |flags| and returns only the
@@ -56,8 +57,6 @@ class UI_BASE_EXPORT Accelerator {
 
   KeyEvent ToKeyEvent() const;
 
-  Accelerator& operator=(const Accelerator& accelerator);
-
   // Define the < operator so that the KeyboardShortcut can be used as a key in
   // a std::map.
   bool operator <(const Accelerator& rhs) const;