summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authornya <nya@chromium.org>2016-03-23 03:12:33 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-23 10:13:46 +0000
commit1b5973d3a7a70a3446502035ef5431c7fda56518 (patch)
tree71ffc3e755a02b918d1d0382c96a04a88e1d7356 /chromeos
parent26d91d2108a891ad9e0cfed8d15fbb312381fda1 (diff)
downloadchromium_src-1b5973d3a7a70a3446502035ef5431c7fda56518.zip
chromium_src-1b5973d3a7a70a3446502035ef5431c7fda56518.tar.gz
chromium_src-1b5973d3a7a70a3446502035ef5431c7fda56518.tar.bz2
Revert of Add ArcEnabled policy implementation
Reason for revert: This change broke --disable-arc-opt-in-verification used for autotests. > Add ArcEnabled policy implementation > > Hide "ARC OptIn" control from Chrome:Settings for enterprise users, > map ArcEnabled policy to ArcEnabled pref. > > BUG=582440 > > Review URL: https://codereview.chromium.org/1684063002 > > Cr-Commit-Position: refs/heads/master@{#382266} TBR=pbond@chromium.org,bartfab@chromium.org,jochen@chromium.org,dbeam@chromium.org,tnagel@chromium.org,hidehiko@chromium.org,hashimoto@chromium.org BUG=582440 Review URL: https://codereview.chromium.org/1825143003 Cr-Commit-Position: refs/heads/master@{#382819}
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/fake_session_manager_client.cc15
-rw-r--r--chromeos/dbus/fake_session_manager_client.h4
2 files changed, 7 insertions, 12 deletions
diff --git a/chromeos/dbus/fake_session_manager_client.cc b/chromeos/dbus/fake_session_manager_client.cc
index 58ffcd7..3c055b4 100644
--- a/chromeos/dbus/fake_session_manager_client.cc
+++ b/chromeos/dbus/fake_session_manager_client.cc
@@ -16,8 +16,7 @@ namespace chromeos {
FakeSessionManagerClient::FakeSessionManagerClient()
: start_device_wipe_call_count_(0),
notify_lock_screen_shown_call_count_(0),
- notify_lock_screen_dismissed_call_count_(0),
- arc_available_(false) {}
+ notify_lock_screen_dismissed_call_count_(0) {}
FakeSessionManagerClient::~FakeSessionManagerClient() {
}
@@ -153,19 +152,19 @@ void FakeSessionManagerClient::GetServerBackedStateKeys(
void FakeSessionManagerClient::CheckArcAvailability(
const ArcCallback& callback) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(callback, arc_available_));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback, false));
}
void FakeSessionManagerClient::StartArcInstance(const std::string& socket_path,
const ArcCallback& callback) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(callback, arc_available_));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback, false));
}
void FakeSessionManagerClient::StopArcInstance(const ArcCallback& callback) {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(callback, arc_available_));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ base::Bind(callback, false));
}
const std::string& FakeSessionManagerClient::device_policy() const {
diff --git a/chromeos/dbus/fake_session_manager_client.h b/chromeos/dbus/fake_session_manager_client.h
index e5b594a..4150091 100644
--- a/chromeos/dbus/fake_session_manager_client.h
+++ b/chromeos/dbus/fake_session_manager_client.h
@@ -105,8 +105,6 @@ class FakeSessionManagerClient : public SessionManagerClient {
return notify_lock_screen_dismissed_call_count_;
}
- void set_arc_available(bool available) { arc_available_ = available; }
-
private:
std::string device_policy_;
std::map<cryptohome::Identification, std::string> user_policies_;
@@ -119,8 +117,6 @@ class FakeSessionManagerClient : public SessionManagerClient {
int notify_lock_screen_shown_call_count_;
int notify_lock_screen_dismissed_call_count_;
- bool arc_available_;
-
DISALLOW_COPY_AND_ASSIGN(FakeSessionManagerClient);
};