| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/guestview/webview/webview_guest.h" | 5 #include "chrome/browser/guestview/webview/webview_guest.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "chrome/browser/extensions/api/web_request/web_request_api.h" | 9 #include "chrome/browser/extensions/api/web_request/web_request_api.h" |
| 10 #include "chrome/browser/extensions/extension_renderer_state.h" | 10 #include "chrome/browser/extensions/extension_renderer_state.h" |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 scoped_ptr<DictionaryValue> args(new DictionaryValue()); | 211 scoped_ptr<DictionaryValue> args(new DictionaryValue()); |
| 212 args->SetInteger(webview::kProcessId, | 212 args->SetInteger(webview::kProcessId, |
| 213 web_contents()->GetRenderProcessHost()->GetID()); | 213 web_contents()->GetRenderProcessHost()->GetID()); |
| 214 args->SetString(webview::kReason, TerminationStatusToString(status)); | 214 args->SetString(webview::kReason, TerminationStatusToString(status)); |
| 215 DispatchEvent( | 215 DispatchEvent( |
| 216 new GuestView::Event(webview::kEventExit, args.Pass())); | 216 new GuestView::Event(webview::kEventExit, args.Pass())); |
| 217 } | 217 } |
| 218 | 218 |
| 219 bool WebViewGuest::HandleKeyboardEvent( | 219 bool WebViewGuest::HandleKeyboardEvent( |
| 220 const content::NativeWebKeyboardEvent& event) { | 220 const content::NativeWebKeyboardEvent& event) { |
| 221 if (event.type != WebKit::WebInputEvent::RawKeyDown) | 221 if (event.type != blink::WebInputEvent::RawKeyDown) |
| 222 return false; | 222 return false; |
| 223 | 223 |
| 224 #if defined(OS_MACOSX) | 224 #if defined(OS_MACOSX) |
| 225 if (event.modifiers != WebKit::WebInputEvent::MetaKey) | 225 if (event.modifiers != blink::WebInputEvent::MetaKey) |
| 226 return false; | 226 return false; |
| 227 | 227 |
| 228 if (event.windowsKeyCode == ui::VKEY_OEM_4) { | 228 if (event.windowsKeyCode == ui::VKEY_OEM_4) { |
| 229 Go(-1); | 229 Go(-1); |
| 230 return true; | 230 return true; |
| 231 } | 231 } |
| 232 | 232 |
| 233 if (event.windowsKeyCode == ui::VKEY_OEM_6) { | 233 if (event.windowsKeyCode == ui::VKEY_OEM_6) { |
| 234 Go(1); | 234 Go(1); |
| 235 return true; | 235 return true; |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 | 589 |
| 590 WebViewGuest::PermissionResponseInfo::PermissionResponseInfo( | 590 WebViewGuest::PermissionResponseInfo::PermissionResponseInfo( |
| 591 const PermissionResponseCallback& callback, | 591 const PermissionResponseCallback& callback, |
| 592 bool allowed_by_default) | 592 bool allowed_by_default) |
| 593 : callback(callback), | 593 : callback(callback), |
| 594 allowed_by_default(allowed_by_default) { | 594 allowed_by_default(allowed_by_default) { |
| 595 } | 595 } |
| 596 | 596 |
| 597 WebViewGuest::PermissionResponseInfo::~PermissionResponseInfo() { | 597 WebViewGuest::PermissionResponseInfo::~PermissionResponseInfo() { |
| 598 } | 598 } |
| OLD | NEW |