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

Unified Diff: content/ppapi_plugin/broker_process_dispatcher.cc

Issue 10391173: Pepper Flash settings integration: implement "deauthorize content licenses". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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
Index: content/ppapi_plugin/broker_process_dispatcher.cc
diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc
index 6d5ffa81d95e90b68d15e5babc3687f7c0a07569..7844639d98f91511c89040054ce9eab46aff7ee6 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.cc
+++ b/content/ppapi_plugin/broker_process_dispatcher.cc
@@ -8,6 +8,7 @@
#include "base/bind_helpers.h"
#include "base/utf_string_conversions.h"
#include "content/common/child_process.h"
+#include "ppapi/c/pp_bool.h"
#include "ppapi/c/private/ppp_flash_browser_operations.h"
#include "ppapi/proxy/ppapi_messages.h"
@@ -16,6 +17,15 @@ namespace {
// How long we wait before releasing the broker process.
const int kBrokerReleaseTimeSeconds = 30;
+std::string ConvertPluginDataPath(const FilePath& plugin_data_path) {
+ // The string is always 8-bit, convert on Windows.
+#if defined(OS_WIN)
+ return WideToUTF8(plugin_data_path.value());
+#else
+ return plugin_data_path.value();
+#endif
+}
+
} // namespace
BrokerProcessDispatcher::BrokerProcessDispatcher(
@@ -43,6 +53,8 @@ BrokerProcessDispatcher::~BrokerProcessDispatcher() {
bool BrokerProcessDispatcher::OnMessageReceived(const IPC::Message& msg) {
IPC_BEGIN_MESSAGE_MAP(BrokerProcessDispatcher, msg)
IPC_MESSAGE_HANDLER(PpapiMsg_ClearSiteData, OnMsgClearSiteData)
+ IPC_MESSAGE_HANDLER(PpapiMsg_DeauthorizeContentLicenses,
+ OnMsgDeauthorizeContentLicenses)
IPC_MESSAGE_UNHANDLED(return BrokerSideDispatcher::OnMessageReceived(msg))
IPC_END_MESSAGE_MAP()
return true;
@@ -57,6 +69,13 @@ void BrokerProcessDispatcher::OnMsgClearSiteData(
ClearSiteData(plugin_data_path, site, flags, max_age)));
}
+void BrokerProcessDispatcher::OnMsgDeauthorizeContentLicenses(
+ uint32 request_id,
+ const FilePath& plugin_data_path) {
+ Send(new PpapiHostMsg_DeauthorizeContentLicensesResult(
+ request_id, DeauthorizeContentLicenses(plugin_data_path)));
+}
+
bool BrokerProcessDispatcher::ClearSiteData(const FilePath& plugin_data_path,
const std::string& site,
uint64 flags,
@@ -69,16 +88,25 @@ bool BrokerProcessDispatcher::ClearSiteData(const FilePath& plugin_data_path,
if (!browser_interface)
return false;
- // The string is always 8-bit, convert on Windows.
-#if defined(OS_WIN)
- std::string data_str = WideToUTF8(plugin_data_path.value());
-#else
- std::string data_str = plugin_data_path.value();
-#endif
-
+ std::string data_str = ConvertPluginDataPath(plugin_data_path);
browser_interface->ClearSiteData(data_str.c_str(),
site.empty() ? NULL : site.c_str(),
flags, max_age);
return true;
}
+bool BrokerProcessDispatcher::DeauthorizeContentLicenses(
+ const FilePath& plugin_data_path) {
+ if (!get_plugin_interface_)
+ return false;
+ const PPP_Flash_BrowserOperations_1_1* browser_interface =
+ static_cast<const PPP_Flash_BrowserOperations_1_1*>(
+ get_plugin_interface_(PPP_FLASH_BROWSEROPERATIONS_INTERFACE_1_1));
+ if (!browser_interface)
+ return false;
+
+ std::string data_str = ConvertPluginDataPath(plugin_data_path);
+ return PP_ToBool(browser_interface->DeauthorizeContentLicenses(
+ data_str.c_str()));
+}
+
« no previous file with comments | « content/ppapi_plugin/broker_process_dispatcher.h ('k') | content/public/browser/pepper_flash_settings_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698