accelerators: Remove deprecated Accelerator ctor that takes booleans.

BUG=128242
R=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10399085

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137957 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 85 insertions, 77 deletions

diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index d067510..153a13f 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -23,6 +23,65 @@
 
 namespace ui {
 
+Accelerator::Accelerator()
+    : key_code_(ui::VKEY_UNKNOWN),
+      type_(ui::ET_KEY_PRESSED),
+      modifiers_(0) {
+}
+
+Accelerator::Accelerator(KeyboardCode keycode, int modifiers)
+    : key_code_(keycode),
+      type_(ui::ET_KEY_PRESSED),
+      modifiers_(modifiers) {
+}
+
+Accelerator::Accelerator(const Accelerator& accelerator) {
+  key_code_ = accelerator.key_code_;
+  type_ = accelerator.type_;
+  modifiers_ = accelerator.modifiers_;
+}
+
+Accelerator::~Accelerator() {
+}
+
+Accelerator& Accelerator::operator=(const Accelerator& accelerator) {
+  if (this != &accelerator) {
+    key_code_ = accelerator.key_code_;
+    type_ = accelerator.type_;
+    modifiers_ = accelerator.modifiers_;
+  }
+  return *this;
+}
+
+bool Accelerator::operator <(const Accelerator& rhs) const {
+  if (key_code_ != rhs.key_code_)
+    return key_code_ < rhs.key_code_;
+  if (type_ != rhs.type_)
+    return type_ < rhs.type_;
+  return modifiers_ < rhs.modifiers_;
+}
+
+bool Accelerator::operator ==(const Accelerator& rhs) const {
+  return (key_code_ == rhs.key_code_) && (type_ == rhs.type_) &&
+      (modifiers_ == rhs.modifiers_);
+}
+
+bool Accelerator::operator !=(const Accelerator& rhs) const {
+  return !(*this == rhs);
+}
+
+bool Accelerator::IsShiftDown() const {
+  return (modifiers_ & EF_SHIFT_DOWN) == EF_SHIFT_DOWN;
+}
+
+bool Accelerator::IsCtrlDown() const {
+  return (modifiers_ & EF_CONTROL_DOWN) == EF_CONTROL_DOWN;
+}
+
+bool Accelerator::IsAltDown() const {
+  return (modifiers_ & EF_ALT_DOWN) == EF_ALT_DOWN;
+}
+
 string16 Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
index 1ad4609..33beaa4 100644
--- a/ui/base/accelerators/accelerator.h
+++ b/ui/base/accelerators/accelerator.h
@@ -23,94 +23,43 @@ namespace ui {
 // meant to be subclassed for concrete toolkit implementations.
 class UI_EXPORT Accelerator {
  public:
-  Accelerator()
-      : key_code_(ui::VKEY_UNKNOWN), type_(ui::ET_KEY_PRESSED), modifiers_(0) {}
-
-  Accelerator(ui::KeyboardCode keycode, int modifiers)
-      : key_code_(keycode),
-        type_(ui::ET_KEY_PRESSED),
-        modifiers_(modifiers) {}
-
-  Accelerator(const Accelerator& accelerator) {
-    key_code_ = accelerator.key_code_;
-    type_ = accelerator.type_;
-    modifiers_ = accelerator.modifiers_;
-  }
-
-  Accelerator(ui::KeyboardCode keycode,
-              bool shift_pressed, bool ctrl_pressed, bool alt_pressed)
-      : key_code_(keycode),
-        type_(ui::ET_KEY_PRESSED),
-        modifiers_(0) {
-    if (shift_pressed)
-      modifiers_ |= ui::EF_SHIFT_DOWN;
-    if (ctrl_pressed)
-      modifiers_ |= ui::EF_CONTROL_DOWN;
-    if (alt_pressed)
-      modifiers_ |= ui::EF_ALT_DOWN;
-  }
-
-  virtual ~Accelerator() {}
-
-  Accelerator& operator=(const Accelerator& accelerator) {
-    if (this != &accelerator) {
-      key_code_ = accelerator.key_code_;
-      type_ = accelerator.type_;
-      modifiers_ = accelerator.modifiers_;
-    }
-    return *this;
-  }
+  Accelerator();
+  Accelerator(ui::KeyboardCode keycode, int modifiers);
+  Accelerator(const Accelerator& accelerator);
+  ~Accelerator();
+
+  Accelerator& operator=(const Accelerator& accelerator);
 
   // We define the < operator so that the KeyboardShortcut can be used as a key
   // in a std::map.
-  bool operator <(const Accelerator& rhs) const {
-    if (key_code_ != rhs.key_code_)
-      return key_code_ < rhs.key_code_;
-    if (type_ != rhs.type_)
-      return type_ < rhs.type_;
-    return modifiers_ < rhs.modifiers_;
-  }
-
-  bool operator ==(const Accelerator& rhs) const {
-    return (key_code_ == rhs.key_code_) &&
-        (type_ == rhs.type_) && (modifiers_ == rhs.modifiers_);
-  }
-
-  bool operator !=(const Accelerator& rhs) const {
-    return !(*this == rhs);
-  }
+  bool operator <(const Accelerator& rhs) const;
 
-  ui::KeyboardCode key_code() const { return key_code_; }
+  bool operator ==(const Accelerator& rhs) const;
 
-  ui::EventType type() const { return type_; }
+  bool operator !=(const Accelerator& rhs) const;
+
+  ui::KeyboardCode key_code() const { return key_code_; }
 
   // Sets the event type if the accelerator should be processed on an event
   // other than ui::ET_KEY_PRESSED.
   void set_type(ui::EventType type) { type_ = type; }
+  ui::EventType type() const { return type_; }
 
   int modifiers() const { return modifiers_; }
 
-  bool IsShiftDown() const {
-    return (modifiers_ & ui::EF_SHIFT_DOWN) == ui::EF_SHIFT_DOWN;
-  }
-
-  bool IsCtrlDown() const {
-    return (modifiers_ & ui::EF_CONTROL_DOWN) == ui::EF_CONTROL_DOWN;
-  }
-
-  bool IsAltDown() const {
-    return (modifiers_ & ui::EF_ALT_DOWN) == ui::EF_ALT_DOWN;
-  }
+  bool IsShiftDown() const;
+  bool IsCtrlDown() const;
+  bool IsAltDown() const;
 
   // Returns a string with the localized shortcut if any.
   string16 GetShortcutText() const;
 
  protected:
   // The keycode (VK_...).
-  ui::KeyboardCode key_code_;
+  KeyboardCode key_code_;
 
   // The event type (usually ui::ET_KEY_PRESSED).
-  ui::EventType type_;
+  EventType type_;
 
   // The state of the Shift/Ctrl/Alt keys (platform-dependent).
   int modifiers_;
diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc
index 0193692..fddd914 100644
--- a/ui/base/accelerators/accelerator_manager_unittest.cc
+++ b/ui/base/accelerators/accelerator_manager_unittest.cc
@@ -47,7 +47,7 @@ bool TestTarget::CanHandleAccelerators() const {
 }
 
 Accelerator GetAccelerator(KeyboardCode code, int mask) {
-  return Accelerator(code, mask & (1 << 0), mask & (1 << 1), mask & (1 << 2));
+  return Accelerator(code, mask);
 }
 
 }  // namespace
@@ -61,7 +61,7 @@ class AcceleratorManagerTest : public testing::Test {
 };
 
 TEST_F(AcceleratorManagerTest, Register) {
-  const Accelerator accelerator_a(VKEY_A, false, false, false);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE);
   TestTarget target;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target);
@@ -72,7 +72,7 @@ TEST_F(AcceleratorManagerTest, Register) {
 }
 
 TEST_F(AcceleratorManagerTest, RegisterMultipleTarget) {
-  const Accelerator accelerator_a(VKEY_A, false, false, false);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE);
   TestTarget target1;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target1);
@@ -88,11 +88,11 @@ TEST_F(AcceleratorManagerTest, RegisterMultipleTarget) {
 }
 
 TEST_F(AcceleratorManagerTest, Unregister) {
-  const Accelerator accelerator_a(VKEY_A, false, false, false);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE);
   TestTarget target;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target);
-  const Accelerator accelerator_b(VKEY_B, false, false, false);
+  const Accelerator accelerator_b(VKEY_B, EF_NONE);
   manager_.Register(accelerator_b, AcceleratorManager::kNormalPriority,
                     &target);
 
@@ -110,14 +110,14 @@ TEST_F(AcceleratorManagerTest, Unregister) {
 }
 
 TEST_F(AcceleratorManagerTest, UnregisterAll) {
-  const Accelerator accelerator_a(VKEY_A, false, false, false);
+  const Accelerator accelerator_a(VKEY_A, EF_NONE);
   TestTarget target1;
   manager_.Register(accelerator_a, AcceleratorManager::kNormalPriority,
                     &target1);
-  const Accelerator accelerator_b(VKEY_B, false, false, false);
+  const Accelerator accelerator_b(VKEY_B, EF_NONE);
   manager_.Register(accelerator_b, AcceleratorManager::kNormalPriority,
                     &target1);
-  const Accelerator accelerator_c(VKEY_C, false, false, false);
+  const Accelerator accelerator_c(VKEY_C, EF_NONE);
   TestTarget target2;
   manager_.Register(accelerator_c, AcceleratorManager::kNormalPriority,
                     &target2);