Merge 182705

chrome/browser/signin/signin_manager.h

Index: chrome/browser/signin/signin_manager.h
===================================================================
--- chrome/browser/signin/signin_manager.h	(revision 183433)
+++ chrome/browser/signin/signin_manager.h	(working copy)
@@ -188,6 +188,13 @@
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
+  // Tells the SigninManager to prohibit signout for this profile.
+  void ProhibitSignout();
+
+  // If true, signout is prohibited for this profile (calls to SignOut() are
+  // ignored).
+  bool IsSignoutProhibited() const;
+
  protected:
   // Weak pointer to parent profile (protected so FakeSigninManager can access
   // it).
@@ -198,6 +205,9 @@
   // SigninManager (so we can expose a reference for use in the wrench menu).
   scoped_ptr<SigninGlobalError> signin_global_error_;
 
+  // Flag saying whether signing out is allowed.
+  bool prohibit_signout_;
+
  private:
   enum SigninType {
     SIGNIN_TYPE_NONE,