| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1115 bool RenderViewHostImpl::MayRenderWidgetForwardKeyboardEvent( | 1115 bool RenderViewHostImpl::MayRenderWidgetForwardKeyboardEvent( |
| 1116 const NativeWebKeyboardEvent& key_event) { | 1116 const NativeWebKeyboardEvent& key_event) { |
| 1117 if (GetWidget()->ignore_input_events()) { | 1117 if (GetWidget()->ignore_input_events()) { |
| 1118 if (key_event.type == WebInputEvent::RawKeyDown) | 1118 if (key_event.type == WebInputEvent::RawKeyDown) |
| 1119 delegate_->OnIgnoredUIEvent(); | 1119 delegate_->OnIgnoredUIEvent(); |
| 1120 return false; | 1120 return false; |
| 1121 } | 1121 } |
| 1122 return true; | 1122 return true; |
| 1123 } | 1123 } |
| 1124 | 1124 |
| 1125 void RenderViewHostImpl::OnTextSurroundingSelectionResponse( | |
| 1126 const base::string16& content, | |
| 1127 size_t start_offset, | |
| 1128 size_t end_offset) { | |
| 1129 if (!GetWidget()->GetView()) | |
| 1130 return; | |
| 1131 GetWidget()->GetView()->OnTextSurroundingSelectionResponse( | |
| 1132 content, start_offset, end_offset); | |
| 1133 } | |
| 1134 | |
| 1135 WebPreferences RenderViewHostImpl::GetWebkitPreferences() { | 1125 WebPreferences RenderViewHostImpl::GetWebkitPreferences() { |
| 1136 if (!web_preferences_.get()) { | 1126 if (!web_preferences_.get()) { |
| 1137 OnWebkitPreferencesChanged(); | 1127 OnWebkitPreferencesChanged(); |
| 1138 } | 1128 } |
| 1139 return *web_preferences_; | 1129 return *web_preferences_; |
| 1140 } | 1130 } |
| 1141 | 1131 |
| 1142 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) { | 1132 void RenderViewHostImpl::UpdateWebkitPreferences(const WebPreferences& prefs) { |
| 1143 web_preferences_.reset(new WebPreferences(prefs)); | 1133 web_preferences_.reset(new WebPreferences(prefs)); |
| 1144 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); | 1134 Send(new ViewMsg_UpdateWebPreferences(GetRoutingID(), prefs)); |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1331 // Note: We are using the origin URL provided by the sender here. It may be | 1321 // Note: We are using the origin URL provided by the sender here. It may be |
| 1332 // different from the receiver's. | 1322 // different from the receiver's. |
| 1333 file_system_file.url = | 1323 file_system_file.url = |
| 1334 GURL(storage::GetIsolatedFileSystemRootURIString( | 1324 GURL(storage::GetIsolatedFileSystemRootURIString( |
| 1335 file_system_url.origin(), filesystem_id, std::string()) | 1325 file_system_url.origin(), filesystem_id, std::string()) |
| 1336 .append(register_name)); | 1326 .append(register_name)); |
| 1337 } | 1327 } |
| 1338 } | 1328 } |
| 1339 | 1329 |
| 1340 } // namespace content | 1330 } // namespace content |
| OLD | NEW |