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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1340 return; | 1340 return; |
1341 GetRenderWidget()->UpdateSelectionBounds(); | 1341 GetRenderWidget()->UpdateSelectionBounds(); |
1342 } | 1342 } |
1343 | 1343 |
1344 void RenderFrameImpl::PepperCancelComposition( | 1344 void RenderFrameImpl::PepperCancelComposition( |
1345 PepperPluginInstanceImpl* instance) { | 1345 PepperPluginInstanceImpl* instance) { |
1346 if (instance != focused_pepper_plugin_) | 1346 if (instance != focused_pepper_plugin_) |
1347 return; | 1347 return; |
1348 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); | 1348 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); |
1349 #if defined(OS_MACOSX) || defined(USE_AURA) | 1349 #if defined(OS_MACOSX) || defined(USE_AURA) |
1350 GetRenderWidget()->UpdateCompositionInfo( | 1350 GetRenderWidget()->updateCompositionInfo( |
1351 false /* not an immediate request */); | 1351 false /* not an immediate request */); |
1352 #endif | 1352 #endif |
1353 } | 1353 } |
1354 | 1354 |
1355 void RenderFrameImpl::PepperSelectionChanged( | 1355 void RenderFrameImpl::PepperSelectionChanged( |
1356 PepperPluginInstanceImpl* instance) { | 1356 PepperPluginInstanceImpl* instance) { |
1357 if (instance != focused_pepper_plugin_) | 1357 if (instance != focused_pepper_plugin_) |
1358 return; | 1358 return; |
1359 SyncSelectionIfRequired(); | 1359 SyncSelectionIfRequired(); |
1360 } | 1360 } |
(...skipping 5611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6972 policy(info.defaultPolicy), | 6972 policy(info.defaultPolicy), |
6973 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6973 replaces_current_history_item(info.replacesCurrentHistoryItem), |
6974 history_navigation_in_new_child_frame( | 6974 history_navigation_in_new_child_frame( |
6975 info.isHistoryNavigationInNewChildFrame), | 6975 info.isHistoryNavigationInNewChildFrame), |
6976 client_redirect(info.isClientRedirect), | 6976 client_redirect(info.isClientRedirect), |
6977 cache_disabled(info.isCacheDisabled), | 6977 cache_disabled(info.isCacheDisabled), |
6978 form(info.form), | 6978 form(info.form), |
6979 source_location(info.sourceLocation) {} | 6979 source_location(info.sourceLocation) {} |
6980 | 6980 |
6981 } // namespace content | 6981 } // namespace content |
OLD | NEW |