summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/fake_session_manager_client.h
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-24 12:33:44 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-24 12:33:44 +0000
commitc8252d4a18cf50c07ce68fb737b73e103dc1ef52 (patch)
tree50757b7d1fbd37a30fd41a85a09ba5d657d5406d /chromeos/dbus/fake_session_manager_client.h
parent75608c0c08a36d6c6804760a32139f1ad6e72555 (diff)
downloadchromium_src-c8252d4a18cf50c07ce68fb737b73e103dc1ef52.zip
chromium_src-c8252d4a18cf50c07ce68fb737b73e103dc1ef52.tar.gz
chromium_src-c8252d4a18cf50c07ce68fb737b73e103dc1ef52.tar.bz2
Load the policy store synchronously on ChromeOS, when appropriate.
The Profile can be created both in a synchronous and asynchronous mode. When asynchronous then the policy subsystems can load policy asynchronously, and the Profile resumes initialization once the policies are ready; this is the default on ChromeOS. But the synchronous path must load all the preferences (and thus, all the policies) during construction of the Profile, and this is used on ChromeOS when restarting the browser after a crash or after changing the flags. This CL makes that path load policy synchronously, so that the Profile starts with the correct managed settings immediately. Additionally, since the PolicyServiceImpl sends out its initialization and policy-changed signals in different tasks, this CL makes the PolicyPrefStore recompute the managed preferences on the initialization signal as well. BUG=263061 Review URL: https://chromiumcodereview.appspot.com/20053003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/fake_session_manager_client.h')
-rw-r--r--chromeos/dbus/fake_session_manager_client.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromeos/dbus/fake_session_manager_client.h b/chromeos/dbus/fake_session_manager_client.h
index 1acd082..5c8941b3 100644
--- a/chromeos/dbus/fake_session_manager_client.h
+++ b/chromeos/dbus/fake_session_manager_client.h
@@ -44,6 +44,8 @@ class FakeSessionManagerClient : public chromeos::SessionManagerClient {
virtual void RetrievePolicyForUser(
const std::string& username,
const RetrievePolicyCallback& callback) OVERRIDE;
+ virtual std::string BlockingRetrievePolicyForUser(
+ const std::string& username) OVERRIDE;
virtual void RetrieveDeviceLocalAccountPolicy(
const std::string& account_id,
const RetrievePolicyCallback& callback) OVERRIDE;