summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/ui/gtk/accelerators_gtk_unittest.cc27
-rw-r--r--chrome/chrome_tests.gypi2
2 files changed, 29 insertions, 0 deletions
diff --git a/chrome/browser/ui/gtk/accelerators_gtk_unittest.cc b/chrome/browser/ui/gtk/accelerators_gtk_unittest.cc
new file mode 100644
index 0000000..b3fbb21
--- /dev/null
+++ b/chrome/browser/ui/gtk/accelerators_gtk_unittest.cc
@@ -0,0 +1,27 @@
+// Copyright (c) 2011 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.
+
+#include <gdk/gdkkeysyms.h>
+
+#include "base/memory/singleton.h"
+#include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/ui/gtk/accelerators_gtk.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/models/accelerator_gtk.h"
+
+TEST(AcceleratorsGtkTest, GetAccelerator) {
+ AcceleratorsGtk* keymap = AcceleratorsGtk::GetInstance();
+ const ui::AcceleratorGtk* accelerator =
+ keymap->GetPrimaryAcceleratorForCommand(IDC_COPY);
+ ASSERT_TRUE(accelerator);
+ EXPECT_EQ(static_cast<guint>(GDK_c), accelerator->GetGdkKeyCode());
+ EXPECT_EQ(GDK_CONTROL_MASK, accelerator->modifiers());
+}
+
+TEST(AcceleratorsGtkTest, GetNullAccelerator) {
+ AcceleratorsGtk* keymap = AcceleratorsGtk::GetInstance();
+ const ui::AcceleratorGtk* accelerator =
+ keymap->GetPrimaryAcceleratorForCommand(IDC_MinimumLabelValue - 1);
+ EXPECT_FALSE(accelerator);
+}
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d75f77a..a7e901c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1824,6 +1824,7 @@
'browser/ui/content_settings/content_setting_bubble_model_unittest.cc',
'browser/ui/content_settings/content_setting_image_model_unittest.cc',
'browser/ui/find_bar/find_backend_unittest.cc',
+ 'browser/ui/gtk/accelerators_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc',
@@ -2100,6 +2101,7 @@
}],
['toolkit_views==1', {
'sources!': [
+ 'browser/ui/gtk/accelerators_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',