| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
| 2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
| 3 // LICENSE file. | 3 // LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/views/tab_contents/tab_contents_view_gtk.h" | 5 #include "chrome/browser/views/tab_contents/tab_contents_view_gtk.h" |
| 6 | 6 |
| 7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 | 9 |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 if (!focus_manager) | 303 if (!focus_manager) |
| 304 return; | 304 return; |
| 305 | 305 |
| 306 bool shift_pressed = (event.modifiers & WebInputEvent::ShiftKey) == | 306 bool shift_pressed = (event.modifiers & WebInputEvent::ShiftKey) == |
| 307 WebInputEvent::ShiftKey; | 307 WebInputEvent::ShiftKey; |
| 308 bool ctrl_pressed = (event.modifiers & WebInputEvent::ControlKey) == | 308 bool ctrl_pressed = (event.modifiers & WebInputEvent::ControlKey) == |
| 309 WebInputEvent::ControlKey; | 309 WebInputEvent::ControlKey; |
| 310 bool alt_pressed = (event.modifiers & WebInputEvent::AltKey) == | 310 bool alt_pressed = (event.modifiers & WebInputEvent::AltKey) == |
| 311 WebInputEvent::AltKey; | 311 WebInputEvent::AltKey; |
| 312 | 312 |
| 313 focus_manager->ProcessAccelerator(views::Accelerator(event.os_event->keyval, | 313 focus_manager->ProcessAccelerator(views::Accelerator(event.windowsKeyCode, |
| 314 shift_pressed, | 314 shift_pressed, |
| 315 ctrl_pressed, | 315 ctrl_pressed, |
| 316 alt_pressed)); | 316 alt_pressed)); |
| 317 // DANGER: |this| could be deleted now! | 317 // DANGER: |this| could be deleted now! |
| 318 | 318 |
| 319 // Note that we do not handle Gtk mnemonics/accelerators or binding set here | 319 // Note that we do not handle Gtk mnemonics/accelerators or binding set here |
| 320 // (as it is done in BrowserWindowGtk::HandleKeyboardEvent), as we override | 320 // (as it is done in BrowserWindowGtk::HandleKeyboardEvent), as we override |
| 321 // Gtk behavior completely. | 321 // Gtk behavior completely. |
| 322 } | 322 } |
| 323 | 323 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 | 387 |
| 388 private: | 388 private: |
| 389 DISALLOW_COPY_AND_ASSIGN(BlockedPopupContainerViewGtk); | 389 DISALLOW_COPY_AND_ASSIGN(BlockedPopupContainerViewGtk); |
| 390 }; | 390 }; |
| 391 | 391 |
| 392 // static | 392 // static |
| 393 BlockedPopupContainerView* BlockedPopupContainerView::Create( | 393 BlockedPopupContainerView* BlockedPopupContainerView::Create( |
| 394 BlockedPopupContainer* container) { | 394 BlockedPopupContainer* container) { |
| 395 return new BlockedPopupContainerViewGtk; | 395 return new BlockedPopupContainerViewGtk; |
| 396 } | 396 } |
| OLD | NEW |