Index: chrome/browser/ui/views/frame/browser_view.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
index 4b7c6ebdc7299a6a54d84b652b5b61e4eb00b920..bb27dd8f1eb848867cd9bba0f9c6872d231c411b 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.cc |
+++ b/chrome/browser/ui/views/frame/browser_view.cc |
@@ -1294,8 +1294,8 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
bool* is_keyboard_shortcut) { |
*is_keyboard_shortcut = false; |
- if ((event.type != WebKit::WebInputEvent::RawKeyDown) && |
- (event.type != WebKit::WebInputEvent::KeyUp)) { |
+ if ((event.type != blink::WebInputEvent::RawKeyDown) && |
+ (event.type != blink::WebInputEvent::KeyUp)) { |
return false; |
} |
@@ -1303,7 +1303,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
// As Alt+F4 is the close-app keyboard shortcut, it needs processing |
// immediately. |
if (event.windowsKeyCode == ui::VKEY_F4 && |
- event.type == WebKit::WebInputEvent::RawKeyDown && |
+ event.type == blink::WebInputEvent::RawKeyDown && |
event.modifiers == NativeWebKeyboardEvent::AltKey) { |
DefWindowProc(event.os_event.hwnd, event.os_event.message, |
event.os_event.wParam, event.os_event.lParam); |
@@ -1320,7 +1320,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
ui::Accelerator accelerator( |
static_cast<ui::KeyboardCode>(event.windowsKeyCode), |
content::GetModifiersFromNativeWebKeyboardEvent(event)); |
- if (event.type == WebKit::WebInputEvent::KeyUp) |
+ if (event.type == blink::WebInputEvent::KeyUp) |
accelerator.set_type(ui::ET_KEY_RELEASED); |
// What we have to do here is as follows: |
@@ -1365,7 +1365,7 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, |
if (id != -1) { |
// |accelerator| is a non-reserved browser shortcut (e.g. Ctrl+f). |
- if (event.type == WebKit::WebInputEvent::RawKeyDown) |
+ if (event.type == blink::WebInputEvent::RawKeyDown) |
*is_keyboard_shortcut = true; |
} else if (processed) { |
// |accelerator| is a non-browser shortcut (e.g. F4-F10 on Ash). Report |