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

Unified Diff: chrome/browser/extensions/external_policy_loader.cc

Issue 536753003: Add recommended extension installation support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext-3
Patch Set: more fixes Created 6 years, 2 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: chrome/browser/extensions/external_policy_loader.cc
diff --git a/chrome/browser/extensions/external_policy_loader.cc b/chrome/browser/extensions/external_policy_loader.cc
index 5297519142efebef28521165b7a2433fb17c1b10..901fffad4a0c4535a38a010cf781da7d97ef4951 100644
--- a/chrome/browser/extensions/external_policy_loader.cc
+++ b/chrome/browser/extensions/external_policy_loader.cc
@@ -4,14 +4,16 @@
#include "chrome/browser/extensions/external_policy_loader.h"
+#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "chrome/browser/extensions/external_provider_impl.h"
namespace extensions {
-ExternalPolicyLoader::ExternalPolicyLoader(ExtensionManagement *settings)
- : settings_(settings) {
+ExternalPolicyLoader::ExternalPolicyLoader(ExtensionManagement* settings,
+ InstallationType type)
+ : settings_(settings), type_(type) {
settings_->AddObserver(this);
}
@@ -33,7 +35,16 @@ void ExternalPolicyLoader::AddExtension(base::DictionaryValue* dict,
}
void ExternalPolicyLoader::StartLoading() {
- prefs_ = settings_->GetForceInstallList();
+ switch (type_) {
+ case FORCED:
+ prefs_ = settings_->GetForceInstallList();
+ break;
+ case RECOMMENDED:
+ prefs_ = settings_->GetRecommendedInstallList();
+ break;
+ default:
+ NOTREACHED();
Finnur 2014/10/06 19:35:27 Leaving out the default case altogether is better
binjin 2014/10/07 09:29:23 Done.
+ }
LoadFinished();
}
« no previous file with comments | « chrome/browser/extensions/external_policy_loader.h ('k') | chrome/browser/extensions/external_policy_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698