ui/base: Clean up our AcceleratorGtk class.

ui/base/accelerators/accelerator_gtk.h

Index: ui/base/accelerators/accelerator_gtk.h
diff --git a/ui/base/accelerators/accelerator_gtk.h b/ui/base/accelerators/accelerator_gtk.h
index 4b4f1b3acf54fe44e4cbbc5340f2df52d283bd22..67afca151cd3c86bbb765948bfd41582b4d23659 100644
--- a/ui/base/accelerators/accelerator_gtk.h
+++ b/ui/base/accelerators/accelerator_gtk.h
@@ -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.
 
@@ -9,49 +9,31 @@
 #include <gdk/gdk.h>
 
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
-#include "ui/base/keycodes/keyboard_codes_posix.h"
+#include "ui/base/ui_export.h"
 
 namespace ui {
 
-class AcceleratorGtk : public Accelerator {
+class UI_EXPORT AcceleratorGtk : public Accelerator {
  public:
-  AcceleratorGtk(ui::KeyboardCode key_code,
-                 bool shift_pressed, bool ctrl_pressed, bool alt_pressed)
-      : gdk_keyval_(0) {
-    key_code_ = key_code;
-    modifiers_ = 0;
-    if (shift_pressed)
-      modifiers_ |= GDK_SHIFT_MASK;
-    if (ctrl_pressed)
-      modifiers_ |= GDK_CONTROL_MASK;
-    if (alt_pressed)
-      modifiers_ |= GDK_MOD1_MASK;
-  }
-
-  AcceleratorGtk(guint keyval, GdkModifierType modifier_type) {
-    key_code_ = ui::WindowsKeyCodeForGdkKeyCode(keyval);
-    gdk_keyval_ = keyval;
-    modifiers_ = modifier_type;
-  }
-
-  AcceleratorGtk() : gdk_keyval_(0) { }
-  virtual ~AcceleratorGtk() { }
-
-  guint GetGdkKeyCode() const {
-    return gdk_keyval_ > 0 ?
-           // The second parameter is false because accelerator keys are
-           // expressed in terms of the non-shift-modified key.
-           gdk_keyval_ : ui::GdkKeyCodeForWindowsKeyCode(key_code_, false);
-  }
-
-  GdkModifierType gdk_modifier_type() const {

[sky, 2012/04/02 15:12:16]

unix_hacker_style is fine for this.

[tfarina, 2012/04/02 20:25:16]

Done.

-    return static_cast<GdkModifierType>(modifiers());
-  }
+  AcceleratorGtk();
+
+  AcceleratorGtk(guint key_code, GdkModifierType modifier_type);
+
+  AcceleratorGtk(KeyboardCode key_code,
+                 bool shift_pressed,
+                 bool ctrl_pressed,
+                 bool alt_pressed);
+
+  virtual ~AcceleratorGtk();
+
+  guint GetGdkKeyCode() const;
+
+  GdkModifierType GetGdkModifierType() const;
 
  private:
-  // The GDK keycode.
-  guint gdk_keyval_;
+  guint gdk_key_code_;
+
+  // Copy and assign is allowed.
 };
 
 }  // namespace ui