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

Unified Diff: chrome/browser/managed_mode/managed_user_service.cc

Issue 14066003: Don't allow elevation for CHROME_OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bug in set_elevated function. Created 7 years, 8 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/managed_mode/managed_user_service.cc
diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc
index 7b92f18671b7f42f1d3c5519d9580d9a6fcd7075..12708c189cc9361b51a6ee7203e87d602d52c79b 100644
--- a/chrome/browser/managed_mode/managed_user_service.cc
+++ b/chrome/browser/managed_mode/managed_user_service.cc
@@ -129,6 +129,9 @@ bool ManagedUserService::IsPassphraseEmpty() const {
bool ManagedUserService::CanSkipPassphraseDialog(
const content::WebContents* web_contents) const {
+#if defined(OS_CHROMEOS)
+ NOTREACHED();
+#endif
return IsElevatedForWebContents(web_contents) ||
IsPassphraseEmpty();
}
@@ -136,6 +139,10 @@ bool ManagedUserService::CanSkipPassphraseDialog(
void ManagedUserService::RequestAuthorization(
content::WebContents* web_contents,
const PassphraseCheckedCallback& callback) {
+#if defined(OS_CHROMEOS)
+ NOTREACHED();
+#endif
+
if (CanSkipPassphraseDialog(web_contents)) {
callback.Run(true);
return;
@@ -413,12 +420,20 @@ void ManagedUserService::GetManualExceptionsForHost(const std::string& host,
void ManagedUserService::AddElevationForExtension(
const std::string& extension_id) {
+#if defined(OS_CHROMEOS)
+ NOTREACHED();
+#else
elevated_for_extensions_.insert(extension_id);
+#endif
}
void ManagedUserService::RemoveElevationForExtension(
const std::string& extension_id) {
+#if defined(OS_CHROMEOS)
+ NOTREACHED();
+#else
elevated_for_extensions_.erase(extension_id);
+#endif
}
void ManagedUserService::Init() {
@@ -436,10 +451,13 @@ void ManagedUserService::Init() {
content::Source<Profile>(profile_));
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
content::Source<Profile>(profile_));
+#if !defined(OS_CHROMEOS)
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
content::Source<Profile>(profile_));
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
content::Source<Profile>(profile_));
+#endif
+
pref_change_registrar_.Init(profile_->GetPrefs());
pref_change_registrar_.Add(
prefs::kDefaultManagedModeFilteringBehavior,

Powered by Google App Engine
This is Rietveld 408576698