summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_flash_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 18:10:37 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 18:10:37 +0000
commit2306303ade2ec3f85354623a55015ac674f0f947 (patch)
treee24d7b482009168e4ed67b14239a76ec7954aabc /ppapi/proxy/ppb_flash_proxy.cc
parent6b55aecf5481ebb66f6b93d8f34cca5a44197473 (diff)
downloadchromium_src-2306303ade2ec3f85354623a55015ac674f0f947.zip
chromium_src-2306303ade2ec3f85354623a55015ac674f0f947.tar.gz
chromium_src-2306303ade2ec3f85354623a55015ac674f0f947.tar.bz2
Propogate the UI language on the command line and expose to Flash.
This is just like the NPAPI plugin process and many of the other child processes we have. I wire the command line parameter up to a new Flash setting. TEST=manual BUG=none Review URL: https://chromiumcodereview.appspot.com/10541088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_flash_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_flash_proxy.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc
index f2da43a..a6b7e62 100644
--- a/ppapi/proxy/ppb_flash_proxy.cc
+++ b/ppapi/proxy/ppb_flash_proxy.cc
@@ -287,7 +287,6 @@ int32_t PPB_Flash_Proxy::GetSettingInt(PP_Instance instance,
PP_Var PPB_Flash_Proxy::GetSetting(PP_Instance instance,
PP_FlashSetting setting) {
- ReceiveSerializedVarReturnValue result;
PluginDispatcher* plugin_dispatcher =
static_cast<PluginDispatcher*>(dispatcher());
switch (setting) {
@@ -299,6 +298,9 @@ PP_Var PPB_Flash_Proxy::GetSetting(PP_Instance instance,
case PP_FLASHSETTING_STAGE3DENABLED:
return PP_MakeBool(PP_FromBool(
plugin_dispatcher->preferences().is_stage3d_supported));
+ case PP_FLASHSETTING_LANGUAGE:
+ return StringVar::StringToPPVar(
+ PluginGlobals::Get()->plugin_proxy_delegate()->GetUILanguage());
}
return PP_MakeUndefined();
}