Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1479)

Unified Diff: ppapi/native_client/src/trusted/plugin/plugin.cc

Issue 250063003: Pepper: Move IME workaround from the trusted plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile error Created 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/trusted/plugin/plugin.cc
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index b8979081d117e19587495c31df3820e7540146b6..eace43823b94c338274d2f29546141066f0bf6c1 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -33,7 +33,6 @@
#include "ppapi/c/private/ppb_nacl_private.h"
#include "ppapi/cpp/dev/url_util_dev.h"
#include "ppapi/cpp/module.h"
-#include "ppapi/cpp/text_input_controller.h"
#include "ppapi/native_client/src/trusted/plugin/file_utils.h"
#include "ppapi/native_client/src/trusted/plugin/json_manifest.h"
@@ -65,33 +64,6 @@ const uint32_t kSizeKBBuckets = 100;
} // namespace
-bool Plugin::EarlyInit() {
- PLUGIN_PRINTF(("Plugin::EarlyInit (instance=%p)\n",
- static_cast<void*>(this)));
-
-#ifdef NACL_OSX
- // TODO(kochi): For crbug.com/102808, this is a stopgap solution for Lion
- // until we expose IME API to .nexe. This disables any IME interference
- // against key inputs, so you cannot use off-the-spot IME input for NaCl apps.
- // This makes discrepancy among platforms and therefore we should remove
- // this hack when IME API is made available.
- // The default for non-Mac platforms is still off-the-spot IME mode.
- pp::TextInputController(this).SetTextInputType(PP_TEXTINPUT_TYPE_NONE);
-#endif
-
- // Set up the factory used to produce DescWrappers.
- wrapper_factory_ = new nacl::DescWrapperFactory();
- if (NULL == wrapper_factory_) {
- return false;
- }
- PLUGIN_PRINTF(("Plugin::Init (wrapper_factory=%p)\n",
- static_cast<void*>(wrapper_factory_)));
-
- PLUGIN_PRINTF(("Plugin::Init (return 1)\n"));
- // Return success.
- return true;
-}
-
void Plugin::ShutDownSubprocesses() {
PLUGIN_PRINTF(("Plugin::ShutDownSubprocesses (this=%p)\n",
static_cast<void*>(this)));
@@ -395,23 +367,16 @@ Plugin* Plugin::New(PP_Instance pp_instance) {
bool Plugin::Init(uint32_t argc, const char* argn[], const char* argv[]) {
PLUGIN_PRINTF(("Plugin::Init (argc=%" NACL_PRIu32 ")\n", argc));
nacl_interface_->InitializePlugin(pp_instance(), argc, argn, argv);
-
url_util_ = pp::URLUtil_Dev::Get();
if (url_util_ == NULL)
return false;
- PLUGIN_PRINTF(("Plugin::Init (url_util_=%p)\n",
- static_cast<const void*>(url_util_)));
-
- bool status = EarlyInit();
- if (status) {
- pp::Var manifest_url(pp::PASS_REF, nacl_interface_->GetManifestURLArgument(
- pp_instance()));
- if (manifest_url.is_string() && !manifest_url.AsString().empty())
- RequestNaClManifest(manifest_url.AsString());
- }
- PLUGIN_PRINTF(("Plugin::Init (status=%d)\n", status));
- return status;
+ wrapper_factory_ = new nacl::DescWrapperFactory();
+ pp::Var manifest_url(pp::PASS_REF, nacl_interface_->GetManifestURLArgument(
+ pp_instance()));
+ if (manifest_url.is_string() && !manifest_url.AsString().empty())
+ RequestNaClManifest(manifest_url.AsString());
+ return true;
}
Plugin::Plugin(PP_Instance pp_instance)
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698