Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
muon side of extension constant porting to browser-laptop
Browse files Browse the repository at this point in the history
brave/browser-laptop#9584

Merge after merging
brave/browser-laptop#9585
(or errors will ensue until both are merged)
  • Loading branch information
kevinlawler authored and bridiver committed Jul 9, 2017
1 parent 7f5c48c commit a07c5be
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 400 deletions.
21 changes: 1 addition & 20 deletions brave/browser/api/brave_api_component_updater.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "brave/browser/api/brave_api_component_updater.h"

#include "base/base64.h"
#include "brave/browser/component_updater/default_extensions.h"
#include "brave/browser/component_updater/extension_installer_traits.h"
#include "brave/browser/component_updater/widevine_cdm_component_installer.h"
#include "chrome/browser/browser_process_impl.h"
Expand Down Expand Up @@ -126,25 +125,7 @@ void ComponentUpdater::RegisterComponent(mate::Arguments* args) {

std::string public_key_string;

if (component_id == kOnePasswordId) {
base::Base64Encode(kOnePasswordPublicKeyStr, &public_key_string);
} else if (component_id == kDashlaneId) {
base::Base64Encode(kDashlanePublicKeyStr, &public_key_string);
} else if (component_id == kLastPassId) {
base::Base64Encode(kLastPassPublicKeyStr, &public_key_string);
} else if (component_id == kPDFJSId) {
base::Base64Encode(kPDFJSPublicKeyStr, &public_key_string);
} else if (component_id == kPocketId) {
base::Base64Encode(kPocketPublicKeyStr, &public_key_string);
} else if (component_id == kVimiumId) {
base::Base64Encode(kVimiumPublicKeyStr, &public_key_string);
} else if (component_id == kEnpassId) {
base::Base64Encode(kEnpassPublicKeyStr, &public_key_string);
} else if (component_id == kBitwardenId) {
base::Base64Encode(kBitwardenPublicKeyStr, &public_key_string);
} else if (component_id == kHoneyId) {
base::Base64Encode(kHoneyPublicKeyStr, &public_key_string);
} else if (component_id == kWidevineId) {
if (component_id == kWidevineId) {
brave::RegisterWidevineCdmComponent(
g_browser_process->component_updater(),
registered_callback, ready_callback);
Expand Down
2 changes: 2 additions & 0 deletions brave/browser/api/brave_api_component_updater.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "components/component_updater/component_updater_service.h"
#include "native_mate/handle.h"

const std::string kWidevineId("oimompecagnajdejgnnjijobebaeigek"); // NOLINT

// Just used to give access to OnDemandUpdater since it's private.
// Chromium has ComponentsUI which is a friend class, so we just
// do this hack here to gain access.
Expand Down
1 change: 0 additions & 1 deletion brave/browser/component_updater/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ source_set("component_updater") {
sources = [
"brave_component_updater_configurator.cc",
"brave_component_updater_configurator.h",
"default_extensions.h",
"extension_installer_traits.cc",
"extension_installer_traits.h",
"widevine_cdm_component_installer.cc",
Expand Down
Loading

0 comments on commit a07c5be

Please sign in to comment.