summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 16:51:54 +0000
committerakuegel@chromium.org <akuegel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-17 16:51:54 +0000
commit55595d6ac44aa33c557c67563b612186b201f8de (patch)
tree871c8235ba0a2ec0c38839880bea976a661b7ff0
parentb1f117e4ecbf56bbc14cc8b28301794e1e3107ea (diff)
downloadchromium_src-55595d6ac44aa33c557c67563b612186b201f8de.zip
chromium_src-55595d6ac44aa33c557c67563b612186b201f8de.tar.gz
chromium_src-55595d6ac44aa33c557c67563b612186b201f8de.tar.bz2
Remove switch to enable access request notifications.
BUG=362553 Review URL: https://codereview.chromium.org/399623009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283798 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/supervised_user/permission_request_creator_sync.cc7
-rw-r--r--chrome/common/chrome_switches.cc5
-rw-r--r--chrome/common/chrome_switches.h1
3 files changed, 1 insertions, 12 deletions
diff --git a/chrome/browser/supervised_user/permission_request_creator_sync.cc b/chrome/browser/supervised_user/permission_request_creator_sync.cc
index 4ad68c5..5555142 100644
--- a/chrome/browser/supervised_user/permission_request_creator_sync.cc
+++ b/chrome/browser/supervised_user/permission_request_creator_sync.cc
@@ -5,11 +5,9 @@
#include "chrome/browser/supervised_user/permission_request_creator_sync.h"
#include "base/callback.h"
-#include "base/command_line.h"
#include "base/values.h"
#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
-#include "chrome/common/chrome_switches.h"
using base::Time;
@@ -55,10 +53,7 @@ void PermissionRequestCreatorSync::CreatePermissionRequest(
const base::Value* value = shared_settings_service_->GetValue(
supervised_user_id_, kNotificationSetting);
bool notifications_enabled = false;
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableAccessRequestNotifications)) {
- notifications_enabled = true;
- } else if (value) {
+ if (value) {
bool success = value->GetAsBoolean(&notifications_enabled);
DCHECK(success);
}
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 13adccc..a85ae97 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -409,11 +409,6 @@ const char kDumpBrowserHistograms[] = "dump-browser-histograms";
// Overrides the path of Easy Unlock component app.
extern const char kEasyUnlockAppPath[] = "easy-unlock-app-path";
-// Enables the notifications for the custodian of a supervised user when the
-// supervised user sends an access request.
-extern const char kEnableAccessRequestNotifications[] =
- "enable-access-request-notifications";
-
// Enables the experimental Answers in Suggest feature.
const char kEnableAnswersInSuggest[] = "enable-answers-in-suggest";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 143f66e..7d61423 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -121,7 +121,6 @@ extern const char kDnsLogDetails[];
extern const char kDnsPrefetchDisable[];
extern const char kDumpBrowserHistograms[];
extern const char kEasyUnlockAppPath[];
-extern const char kEnableAccessRequestNotifications[];
extern const char kEnableAnswersInSuggest[];
extern const char kEnableAppList[];
extern const char kEnableAppView[];