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

Unified Diff: content/renderer/pepper/message_channel.cc

Issue 600893002: PPAPI: Move PPB_Messaging 1.2 to stable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unnecessary dependencies Created 6 years, 3 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 | « no previous file | ppapi/api/ppb_messaging.idl » ('j') | ppapi/c/ppb_messaging.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/message_channel.cc
diff --git a/content/renderer/pepper/message_channel.cc b/content/renderer/pepper/message_channel.cc
index 95be20f9b02f4354d156bfc9967db7a60db64445..5354dbb9f6b2283ec05382ef44cba3d379b7694d 100644
--- a/content/renderer/pepper/message_channel.cc
+++ b/content/renderer/pepper/message_channel.cc
@@ -10,8 +10,6 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
-#include "content/public/common/content_client.h"
-#include "content/public/renderer/content_renderer_client.h"
#include "content/renderer/pepper/host_array_buffer_var.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/renderer/pepper/pepper_try_catch.h"
@@ -63,10 +61,6 @@ const char kVarToV8ConversionError[] =
"argument from a PP_Var to a Javascript value. It may have cycles or be of "
"an unsupported type.";
-bool HasDevPermission() {
- return GetContentClient()->renderer()->IsPluginAllowedToUseDevChannelAPIs();
-}
-
} // namespace
// MessageChannel --------------------------------------------------------------
@@ -227,7 +221,7 @@ v8::Local<v8::Value> MessageChannel::GetNamedProperty(
return gin::CreateFunctionTemplate(isolate,
base::Bind(&MessageChannel::PostMessageToNative,
weak_ptr_factory_.GetWeakPtr()))->GetFunction();
- } else if (identifier == kPostMessageAndAwaitResponse && HasDevPermission()) {
+ } else if (identifier == kPostMessageAndAwaitResponse) {
return gin::CreateFunctionTemplate(isolate,
base::Bind(&MessageChannel::PostBlockingMessageToNative,
weak_ptr_factory_.GetWeakPtr()))->GetFunction();
@@ -256,7 +250,7 @@ bool MessageChannel::SetNamedProperty(v8::Isolate* isolate,
PepperTryCatchV8 try_catch(instance_, V8VarConverter::kDisallowObjectVars,
isolate);
if (identifier == kPostMessage ||
- (identifier == kPostMessageAndAwaitResponse && HasDevPermission())) {
+ (identifier == kPostMessageAndAwaitResponse)) {
try_catch.ThrowException("Cannot set properties with the name postMessage"
"or postMessageAndAwaitResponse");
return true;
@@ -276,8 +270,7 @@ std::vector<std::string> MessageChannel::EnumerateNamedProperties(
if (plugin_object)
result = plugin_object->EnumerateNamedProperties(isolate);
result.push_back(kPostMessage);
- if (HasDevPermission())
- result.push_back(kPostMessageAndAwaitResponse);
+ result.push_back(kPostMessageAndAwaitResponse);
return result;
}
« no previous file with comments | « no previous file | ppapi/api/ppb_messaging.idl » ('j') | ppapi/c/ppb_messaging.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698