Add a new constructor to KeyEvent.

views/widget/widget_win.cc

 // 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 "views/widget/widget_win.h"
 
 #include <dwmapi.h>
 
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/system_monitor/system_monitor.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/native_theme_win.h"
 #include "ui/gfx/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/controls/native_control_win.h"
+#include "views/focus/accelerator_handler.h"
 #include "views/focus/focus_util_win.h"
 #include "views/views_delegate.h"
 #include "views/widget/aero_tooltip_manager.h"
 #include "views/widget/child_window_message_processor.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/drop_target_win.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_delegate.h"
 #include "views/widget/widget_utils.h"
 #include "views/window/window_win.h"
 
 #pragma comment(lib, "dwmapi.lib")
 
 using ui::ViewProp;
 
 namespace {
 
 // Returns whether the specified window is the current active window.
 bool IsWindowActive(HWND hwnd) {
   WINDOWINFO info;
   return ::GetWindowInfo(hwnd, &info) &&
          ((info.dwWindowStatus & WS_ACTIVECAPTION) != 0);
 }
 
 }  // namespace
 
 namespace views {
 
+// A singleton object that keeps track of the current message.
+class CurrentMessageWatcher : public MessageLoopForUI::Observer {
+ public:
+  CurrentMessageWatcher() {
+    MessageLoopForUI::current()->AddObserver(this);
+  }
+  virtual ~CurrentMessageWatcher() {
+  }
+
+  const MSG& current_message() const { return current_messages_.back(); }
+
+ private:
+  // Overridden from MessageLoop::Observer:
+  void WillProcessMessage(const MSG& msg) {
+    current_messages_.push_back(msg);
+  }
+  virtual void DidProcessMessage(const MSG& msg) {
+    current_messages_.pop_back();
+  }
+
+  std::vector<MSG> current_messages_;
+
+  DISALLOW_COPY_AND_ASSIGN(CurrentMessageWatcher);
+};
+
 // Property used to link the HWND to its RootView.
 static const char* const kRootViewWindowProperty = "__ROOT_VIEW__";
 
 // Links the HWND to it's Widget (as a Widget, not a WidgetWin).
 static const char* const kWidgetKey = "__VIEWS_WIDGET__";
 
+// static
 bool WidgetWin::screen_reader_active_ = false;
 
+// static
+CurrentMessageWatcher* WidgetWin::message_watcher_ = NULL;
+
 // A custom MSAA object id used to determine if a screen reader is actively
 // listening for MSAA events.
 #define OBJID_CUSTOM 1
 
 RootView* GetRootViewForHWND(HWND hwnd) {
   return reinterpret_cast<RootView*>(
       ViewProp::GetValue(hwnd, kRootViewWindowProperty));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WidgetWin, public
 
 WidgetWin::WidgetWin()
     : close_widget_factory_(this),
       active_mouse_tracking_flags_(0),
       has_capture_(false),
       use_layered_buffer_(true),
       layered_alpha_(255),
       delete_on_destroy_(true),
       can_update_layered_window_(true),
       last_mouse_event_was_move_(false),
       is_mouse_down_(false),
       is_window_(false),
       restore_focus_when_enabled_(false),
       delegate_(NULL),
       accessibility_view_events_index_(-1),
       accessibility_view_events_(kMaxAccessibilityViewEvents) {
+  if (!message_watcher_)
+    message_watcher_ = new CurrentMessageWatcher;
 }
 
 WidgetWin::~WidgetWin() {
 }
 
 // static
 WidgetWin* WidgetWin::GetWidget(HWND hwnd) {
   // TODO(jcivelli): http://crbug.com/44499 We need a way to test that hwnd is
   //                 associated with a WidgetWin (it might be a pure
   //                 WindowImpl).
@@ skipping 422 matching lines @@
   return GetRootView()->ContainsNativeView(native_view);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MessageLoop::Observer
 
 void WidgetWin::WillProcessMessage(const MSG& msg) {
 }
 
 void WidgetWin::DidProcessMessage(const MSG& msg) {
-  if (root_view_->NeedsPainting(true)) {
+  if (root_view_->NeedsPainting(true))
     PaintNow(root_view_->GetScheduledPaintRect());
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FocusTraversable
 
 FocusSearch* WidgetWin::GetFocusSearch() {
   return root_view_->GetFocusSearch();
 }
 
 FocusTraversable* WidgetWin::GetFocusTraversableParent() {
@@ skipping 142 matching lines @@
   SetMsgHandled(FALSE);
 }
 
 void WidgetWin::OnInitMenuPopup(HMENU menu,
                                 UINT position,
                                 BOOL is_system_menu) {
   SetMsgHandled(FALSE);
 }
 
 void WidgetWin::OnKeyDown(TCHAR c, UINT rep_cnt, UINT flags) {
-  KeyEvent event(ui::ET_KEY_PRESSED, ui::KeyboardCodeForWindowsKeyCode(c),
-                 KeyEvent::GetKeyStateFlags(), rep_cnt, flags,
-                 WM_KEYDOWN);
+  KeyEvent event(message_watcher_->current_message());
   RootView* root_view = GetFocusedViewRootView();
   if (!root_view)
     root_view = root_view_.get();
 
   SetMsgHandled(root_view->ProcessKeyEvent(event));
 }
 
 void WidgetWin::OnKeyUp(TCHAR c, UINT rep_cnt, UINT flags) {
-  KeyEvent event(ui::ET_KEY_RELEASED, ui::KeyboardCodeForWindowsKeyCode(c),
-                 KeyEvent::GetKeyStateFlags(), rep_cnt, flags,
-                 WM_KEYUP);
+  KeyEvent event(message_watcher_->current_message());
   RootView* root_view = GetFocusedViewRootView();
   if (!root_view)
     root_view = root_view_.get();
 
   SetMsgHandled(root_view->ProcessKeyEvent(event));
 }
 
 void WidgetWin::OnKillFocus(HWND focused_window) {
   GetFocusManager()->GetWidgetFocusManager()->OnWidgetFocusEvent(
       this->GetNativeView(),
@@ skipping 669 matching lines @@
 Widget* Widget::GetWidgetFromNativeWindow(gfx::NativeWindow native_window) {
   return Widget::GetWidgetFromNativeView(native_window);
 }
 
 // static
 void Widget::NotifyLocaleChanged() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace views