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