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 997 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1008 PepperPluginInstanceImpl* instance) { | 1008 PepperPluginInstanceImpl* instance) { |
1009 if (instance != render_view_->focused_pepper_plugin()) | 1009 if (instance != render_view_->focused_pepper_plugin()) |
1010 return; | 1010 return; |
1011 GetRenderWidget()->UpdateSelectionBounds(); | 1011 GetRenderWidget()->UpdateSelectionBounds(); |
1012 } | 1012 } |
1013 | 1013 |
1014 void RenderFrameImpl::PepperCancelComposition( | 1014 void RenderFrameImpl::PepperCancelComposition( |
1015 PepperPluginInstanceImpl* instance) { | 1015 PepperPluginInstanceImpl* instance) { |
1016 if (instance != render_view_->focused_pepper_plugin()) | 1016 if (instance != render_view_->focused_pepper_plugin()) |
1017 return; | 1017 return; |
1018 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID()));; | 1018 Send(new InputHostMsg_ImeCancelComposition(render_view_->GetRoutingID())); |
1019 #if defined(OS_MACOSX) || defined(USE_AURA) | 1019 #if defined(OS_MACOSX) || defined(USE_AURA) |
1020 GetRenderWidget()->UpdateCompositionInfo(true); | 1020 GetRenderWidget()->UpdateCompositionInfo(true); |
1021 #endif | 1021 #endif |
1022 } | 1022 } |
1023 | 1023 |
1024 void RenderFrameImpl::PepperSelectionChanged( | 1024 void RenderFrameImpl::PepperSelectionChanged( |
1025 PepperPluginInstanceImpl* instance) { | 1025 PepperPluginInstanceImpl* instance) { |
1026 if (instance != render_view_->focused_pepper_plugin()) | 1026 if (instance != render_view_->focused_pepper_plugin()) |
1027 return; | 1027 return; |
1028 SyncSelectionIfRequired(); | 1028 SyncSelectionIfRequired(); |
(...skipping 4611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5640 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5640 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
5641 scoped_refptr<media::AudioOutputDevice> device = | 5641 scoped_refptr<media::AudioOutputDevice> device = |
5642 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5642 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
5643 security_origin); | 5643 security_origin); |
5644 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5644 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
5645 device->Stop(); | 5645 device->Stop(); |
5646 callback.Run(status); | 5646 callback.Run(status); |
5647 } | 5647 } |
5648 | 5648 |
5649 } // namespace content | 5649 } // namespace content |
OLD | NEW |