Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / base / accelerators / accelerator.cc

diff --git a/src/ui/base/accelerators/accelerator.cc b/src/ui/base/accelerators/accelerator.cc
index cb70d89..4627e88 100644 (file)
--- a/src/ui/base/accelerators/accelerator.cc
+++ b/src/ui/base/accelerators/accelerator.cc
@@ -12,8 +12,8 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/strings/grit/ui_strings.h"
 
 #if !defined(OS_WIN) && (defined(USE_AURA) || defined(OS_MACOSX))
 #include "ui/events/keycodes/keyboard_code_conversion.h"
@@ -24,19 +24,22 @@ namespace ui {
 Accelerator::Accelerator()
     : key_code_(ui::VKEY_UNKNOWN),
       type_(ui::ET_KEY_PRESSED),
-      modifiers_(0) {
+      modifiers_(0),
+      is_repeat_(false) {
 }
 
 Accelerator::Accelerator(KeyboardCode keycode, int modifiers)
     : key_code_(keycode),
       type_(ui::ET_KEY_PRESSED),
-      modifiers_(modifiers) {
+      modifiers_(modifiers),
+      is_repeat_(false) {
 }
 
 Accelerator::Accelerator(const Accelerator& accelerator) {
   key_code_ = accelerator.key_code_;
   type_ = accelerator.type_;
   modifiers_ = accelerator.modifiers_;
+  is_repeat_ = accelerator.is_repeat_;
   if (accelerator.platform_accelerator_.get())
     platform_accelerator_ = accelerator.platform_accelerator_->CreateCopy();
 }
@@ -49,6 +52,7 @@ Accelerator& Accelerator::operator=(const Accelerator& accelerator) {
     key_code_ = accelerator.key_code_;
     type_ = accelerator.type_;
     modifiers_ = accelerator.modifiers_;
+    is_repeat_ = accelerator.is_repeat_;
     if (accelerator.platform_accelerator_.get())
       platform_accelerator_ = accelerator.platform_accelerator_->CreateCopy();
     else
@@ -97,6 +101,10 @@ bool Accelerator::IsCmdDown() const {
   return (modifiers_ & EF_COMMAND_DOWN) != 0;
 }
 
+bool Accelerator::IsRepeat() const {
+  return is_repeat_;
+}
+
 base::string16 Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch (key_code_) {