webkit/plugins/ppapi/ppb_flash_impl.cc - Issue 10342013: Generate and connect a Pepper identifier for Chrome OS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/plugins/ppapi/ppb_flash_impl.cc

Issue 10342013: Generate and connect a Pepper identifier for Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup as per brettw; move to serializedreturnvar in the host msg bounce step Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/plugins/ppapi/ppb_flash_impl.cc

diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc

index d88086326b986e2956e9d6dff0dd41923c18e3a4..babd3f7824e0332d7fc6792aa9ad02fb65478c03 100644

--- a/webkit/plugins/ppapi/ppb_flash_impl.cc

+++ b/webkit/plugins/ppapi/ppb_flash_impl.cc

@@ -242,8 +242,8 @@ void PPB_Flash_Impl::UpdateActivity(PP_Instance pp_instance) {

}

PP_Var PPB_Flash_Impl::GetDeviceID(PP_Instance pp_instance) {

- // Not supported in-process.

- return PP_MakeUndefined();

+ std::string id = instance_->delegate()->GetDeviceID();

+ return StringVar::StringToPPVar(id);

}

int32_t PPB_Flash_Impl::GetSettingInt(PP_Instance instance,