Implementing accelerators for Linux toolkit_views

views/window/dialog_client_view.cc

 // Copyright (c) 2006-2008 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 "views/window/dialog_client_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/keyboard_codes.h"
 #include "grit/app_strings.h"
 #include "views/controls/button/native_button.h"
 #include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
@@ skipping 100 matching lines @@
     if (label.empty())
       label = l10n_util::GetString(IDS_APP_OK);
     bool is_default_button =
         (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_OK) != 0;
     ok_button_ = new DialogButton(this, window(),
                                   MessageBoxFlags::DIALOGBUTTON_OK, label,
                                   is_default_button);
     ok_button_->SetGroup(kButtonGroup);
     if (is_default_button)
       default_button_ = ok_button_;
-#if defined(OS_WIN)
     if (!(buttons & MessageBoxFlags::DIALOGBUTTON_CANCEL))
-      ok_button_->AddAccelerator(Accelerator(VK_ESCAPE, false, false, false));
-#else
-    NOTIMPLEMENTED();
-    // TODO(port): add accelerators
-#endif
+      ok_button_->AddAccelerator(Accelerator(base::VKEY_ESCAPE,
+                                             false, false, false));
     AddChildView(ok_button_);
   }
   if (buttons & MessageBoxFlags::DIALOGBUTTON_CANCEL && !cancel_button_) {
     std::wstring label =
         dd->GetDialogButtonLabel(MessageBoxFlags::DIALOGBUTTON_CANCEL);
     if (label.empty()) {
       if (buttons & MessageBoxFlags::DIALOGBUTTON_OK) {
         label = l10n_util::GetString(IDS_APP_CANCEL);
       } else {
         label = l10n_util::GetString(IDS_APP_CLOSE);
       }
     }
     bool is_default_button =
         (dd->GetDefaultDialogButton() & MessageBoxFlags::DIALOGBUTTON_CANCEL)
         != 0;
     cancel_button_ = new DialogButton(this, window(),
                                       MessageBoxFlags::DIALOGBUTTON_CANCEL,
                                       label, is_default_button);
     cancel_button_->SetGroup(kButtonGroup);
-#if defined(OS_WIN)
-    cancel_button_->AddAccelerator(Accelerator(VK_ESCAPE, false, false, false));
-#else
-    NOTIMPLEMENTED();
-    // TODO(port): add accelerators
-#endif
+    cancel_button_->AddAccelerator(Accelerator(base::VKEY_ESCAPE,
+                                               false, false, false));
     if (is_default_button)
       default_button_ = ok_button_;
     AddChildView(cancel_button_);
   }
   if (!buttons) {
     // Register the escape key as an accelerator which will close the window
     // if there are no dialog buttons.
-#if defined(OS_WIN)
-    AddAccelerator(Accelerator(VK_ESCAPE, false, false, false));
-#else
-    NOTIMPLEMENTED();
-    // TODO(port): add accelerators
-#endif
+    AddAccelerator(Accelerator(base::VKEY_ESCAPE, false, false, false));
   }
 }
 
 void DialogClientView::SetDefaultButton(NativeButton* new_default_button) {
   if (default_button_ && default_button_ != new_default_button) {
     default_button_->SetIsDefault(false);
     default_button_ = NULL;
   }
 
   if (new_default_button) {
@@ skipping 177 matching lines @@
     if (width > 0) {
       width += 2 * kButtonHEdgeMargin;
       prefsize.set_width(std::max(prefsize.width(), width));
     }
   }
   prefsize.Enlarge(0, button_height);
   return prefsize;
 }
 
 bool DialogClientView::AcceleratorPressed(const Accelerator& accelerator) {
-#if defined(OS_WIN)
-  DCHECK(accelerator.GetKeyCode() == VK_ESCAPE);  // We only expect Escape key.
-#else
-  NOTIMPLEMENTED();
-  // TODO(port): add accelerators
-#endif
+  // We only expect Escape key.
+  DCHECK(accelerator.GetKeyCode() == base::VKEY_ESCAPE);
   Close();
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, ButtonListener implementation:
 
 void DialogClientView::ButtonPressed(Button* sender) {
   // We NULL check the delegate here since the buttons can receive WM_COMMAND
   // messages even after they (and the window containing us) are destroyed.
@@ skipping 128 matching lines @@
     initialized = true;
   }
 }
 
 void DialogClientView::Close() {
   window()->Close();
   GetDialogDelegate()->OnClose();
 }
 
 }  // namespace views