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

Commit 4cbc075

Browse files
kevinlawlerbridiver
authored andcommitted
muon side of extension constant porting to browser-laptop
brave/browser-laptop#9584 Merge after merging brave/browser-laptop#9585 (or errors will ensue until both are merged)
1 parent cb14002 commit 4cbc075

File tree

4 files changed

+3
-400
lines changed

4 files changed

+3
-400
lines changed

brave/browser/api/brave_api_component_updater.cc

+1-20
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "brave/browser/api/brave_api_component_updater.h"
66

77
#include "base/base64.h"
8-
#include "brave/browser/component_updater/default_extensions.h"
98
#include "brave/browser/component_updater/extension_installer_traits.h"
109
#include "brave/browser/component_updater/widevine_cdm_component_installer.h"
1110
#include "chrome/browser/browser_process_impl.h"
@@ -126,25 +125,7 @@ void ComponentUpdater::RegisterComponent(mate::Arguments* args) {
126125

127126
std::string public_key_string;
128127

129-
if (component_id == kOnePasswordId) {
130-
base::Base64Encode(kOnePasswordPublicKeyStr, &public_key_string);
131-
} else if (component_id == kDashlaneId) {
132-
base::Base64Encode(kDashlanePublicKeyStr, &public_key_string);
133-
} else if (component_id == kLastPassId) {
134-
base::Base64Encode(kLastPassPublicKeyStr, &public_key_string);
135-
} else if (component_id == kPDFJSId) {
136-
base::Base64Encode(kPDFJSPublicKeyStr, &public_key_string);
137-
} else if (component_id == kPocketId) {
138-
base::Base64Encode(kPocketPublicKeyStr, &public_key_string);
139-
} else if (component_id == kVimiumId) {
140-
base::Base64Encode(kVimiumPublicKeyStr, &public_key_string);
141-
} else if (component_id == kEnpassId) {
142-
base::Base64Encode(kEnpassPublicKeyStr, &public_key_string);
143-
} else if (component_id == kBitwardenId) {
144-
base::Base64Encode(kBitwardenPublicKeyStr, &public_key_string);
145-
} else if (component_id == kHoneyId) {
146-
base::Base64Encode(kHoneyPublicKeyStr, &public_key_string);
147-
} else if (component_id == kWidevineId) {
128+
if (component_id == kWidevineId) {
148129
brave::RegisterWidevineCdmComponent(
149130
g_browser_process->component_updater(),
150131
registered_callback, ready_callback);

brave/browser/api/brave_api_component_updater.h

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include "components/component_updater/component_updater_service.h"
1515
#include "native_mate/handle.h"
1616

17+
const std::string kWidevineId("oimompecagnajdejgnnjijobebaeigek"); // NOLINT
18+
1719
// Just used to give access to OnDemandUpdater since it's private.
1820
// Chromium has ComponentsUI which is a friend class, so we just
1921
// do this hack here to gain access.

brave/browser/component_updater/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ source_set("component_updater") {
88
sources = [
99
"brave_component_updater_configurator.cc",
1010
"brave_component_updater_configurator.h",
11-
"default_extensions.h",
1211
"extension_installer_traits.cc",
1312
"extension_installer_traits.h",
1413
"widevine_cdm_component_installer.cc",

0 commit comments

Comments
 (0)