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 "webkit/plugins/ppapi/ppb_flash_impl.h" | 5 #include "webkit/plugins/ppapi/ppb_flash_impl.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 int32_t PPB_Flash_Impl::InvokePrinting(PP_Instance instance) { | 235 int32_t PPB_Flash_Impl::InvokePrinting(PP_Instance instance) { |
236 // TODO(viettrungluu): Implement me. | 236 // TODO(viettrungluu): Implement me. |
237 return PP_ERROR_NOTSUPPORTED; | 237 return PP_ERROR_NOTSUPPORTED; |
238 } | 238 } |
239 | 239 |
240 void PPB_Flash_Impl::UpdateActivity(PP_Instance pp_instance) { | 240 void PPB_Flash_Impl::UpdateActivity(PP_Instance pp_instance) { |
241 // Not supported in-process. | 241 // Not supported in-process. |
242 } | 242 } |
243 | 243 |
244 PP_Var PPB_Flash_Impl::GetDeviceID(PP_Instance pp_instance) { | 244 PP_Var PPB_Flash_Impl::GetDeviceID(PP_Instance pp_instance) { |
245 // Not supported in-process. | 245 std::string id = instance_->delegate()->GetDeviceID(); |
246 return PP_MakeUndefined(); | 246 return StringVar::StringToPPVar(id); |
247 } | 247 } |
248 | 248 |
249 int32_t PPB_Flash_Impl::GetSettingInt(PP_Instance instance, | 249 int32_t PPB_Flash_Impl::GetSettingInt(PP_Instance instance, |
250 PP_FlashSetting setting) { | 250 PP_FlashSetting setting) { |
251 // No current settings are supported in-process. | 251 // No current settings are supported in-process. |
252 return -1; | 252 return -1; |
253 } | 253 } |
254 | 254 |
255 PP_Bool PPB_Flash_Impl::IsClipboardFormatAvailable( | 255 PP_Bool PPB_Flash_Impl::IsClipboardFormatAvailable( |
256 PP_Instance instance, | 256 PP_Instance instance, |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
646 } | 646 } |
647 case PP_FLASH_CLIPBOARD_FORMAT_INVALID: | 647 case PP_FLASH_CLIPBOARD_FORMAT_INVALID: |
648 break; | 648 break; |
649 } | 649 } |
650 | 650 |
651 return PP_ERROR_BADARGUMENT; | 651 return PP_ERROR_BADARGUMENT; |
652 } | 652 } |
653 | 653 |
654 } // namespace ppapi | 654 } // namespace ppapi |
655 } // namespace webkit | 655 } // namespace webkit |
OLD | NEW |