summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/cros
diff options
context:
space:
mode:
authorgfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 13:09:32 +0000
committergfeher@chromium.org <gfeher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 13:09:32 +0000
commit62cb99478bd034816d74937c34a4255dff5bfe1e (patch)
tree7ea71b2b8de11076e4c1c9235d54d62fd83b8fd1 /chrome/browser/chromeos/cros
parente8f8da26a2149d5ab13af5939e7d23b0927f2110 (diff)
downloadchromium_src-62cb99478bd034816d74937c34a4255dff5bfe1e.zip
chromium_src-62cb99478bd034816d74937c34a4255dff5bfe1e.tar.gz
chromium_src-62cb99478bd034816d74937c34a4255dff5bfe1e.tar.bz2
Notify the CrOS Enterprise Daemon if an Enterprise Extension has been installed
Listen for extension install events and restart the Enterprise Daemon if an extension was installed, that is from a policy and it contains the policy marker file. BUG=chromeos:9702 TEST=manual Review URL: http://codereview.chromium.org/5311007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros')
-rw-r--r--chrome/browser/chromeos/cros/login_library.cc5
-rw-r--r--chrome/browser/chromeos/cros/login_library.h3
-rw-r--r--chrome/browser/chromeos/cros/mock_login_library.h1
3 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/cros/login_library.cc b/chrome/browser/chromeos/cros/login_library.cc
index 5af80e90..2f69b02 100644
--- a/chrome/browser/chromeos/cros/login_library.cc
+++ b/chrome/browser/chromeos/cros/login_library.cc
@@ -134,6 +134,10 @@ class LoginLibraryImpl : public LoginLibrary {
return chromeos::StopSession("");
}
+ bool RestartEntd() {
+ return chromeos::RestartEntd();
+ }
+
bool RestartJob(int pid, const std::string& command_line) {
return chromeos::RestartJob(pid, command_line.c_str());
}
@@ -257,6 +261,7 @@ class LoginLibraryStubImpl : public LoginLibrary {
const std::string& unique_id /* unused */) { return true; }
bool StopSession(const std::string& unique_id /* unused */) { return true; }
bool RestartJob(int pid, const std::string& command_line) { return true; }
+ bool RestartEntd() { return true; }
private:
static void DoStubCallback(Delegate* callback) {
diff --git a/chrome/browser/chromeos/cros/login_library.h b/chrome/browser/chromeos/cros/login_library.h
index fc9b11a..b9ba6e1 100644
--- a/chrome/browser/chromeos/cros/login_library.h
+++ b/chrome/browser/chromeos/cros/login_library.h
@@ -95,6 +95,9 @@ class LoginLibrary {
// indicated by |unique_id|.
virtual bool StopSession(const std::string& unique_id /* unused */) = 0;
+ // Restarts the Enterprise Daemon.
+ virtual bool RestartEntd() = 0;
+
// Restarts the job with specified command line string.
virtual bool RestartJob(int pid, const std::string& command_line) = 0;
diff --git a/chrome/browser/chromeos/cros/mock_login_library.h b/chrome/browser/chromeos/cros/mock_login_library.h
index 43a77b4..48d62c8 100644
--- a/chrome/browser/chromeos/cros/mock_login_library.h
+++ b/chrome/browser/chromeos/cros/mock_login_library.h
@@ -36,6 +36,7 @@ class MockLoginLibrary : public LoginLibrary {
Delegate*));
MOCK_METHOD2(StartSession, bool(const std::string&, const std::string&));
MOCK_METHOD1(StopSession, bool(const std::string&));
+ MOCK_METHOD0(RestartEntd, bool(void));
MOCK_METHOD2(RestartJob, bool(int, const std::string&));
};