Disable some API calls in networkingPrivate for non-primary user

chromeos/login/login_state.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_LOGIN_LOGIN_STATE_H_
 #define CHROMEOS_LOGIN_LOGIN_STATE_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
@@ skipping 33 matching lines @@
   // Manage singleton instance.
   static void Initialize();
   static void Shutdown();
   static LoginState* Get();
   static bool IsInitialized();
 
   // Add/remove observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  // Set the logged in state and user type.
+  // Sets the logged in state, user type, and primary user hash. Also notifies

[pneubeck (no reviews), 2014/06/12 09:51:01]

I find this interface a bit odd in the light of multiple users / logins.

Could you either clarify what is supposed to be called on each login if
multiprofile is available?

Would it be safer to have only a single function which is to be called on the
first login no matter if we use multiprofile or not (or maybe even on every
login); so that it forces the caller to think about the correct arguments?

Don't we still ignore logouts completely? Shouldn't the interface convey that
too (at least comment)?

E.g.
// Sets LoggedInState to LOGGED_IN_ACTIVE. Must be called at first
// login and at most once during the lifetime of this object.
SetFirstLogin(LoggedInUserType type, const std::string& user_hash);

// Must be called on each login after the initial login during the
// same sesson.
SetSecondaryLogins(const std::string& user_hash);

alternatively, a single function:
// Must be called on every login. Secondary logins must match the
// type of the primary login.
OnLogin(LoggedInUserType type, const std::string& user_hash);

(not sure what a good prefix is: On-/Set-/...?)

[stevenjb, 2014/06/12 20:27:51]

This should be called exactly once when a user logs in. I will add that to the
comment.

The reason I didn't just add "SetPrimaryUser" is that I didn't want to
complicate the observer model and requiring "SetPrimaryUser" to be called before
"SetLoggedInState" would be awkward.

My understanding is that login/User will be getting moved (finally!) to
src/chromeos at which point we should be able to get rid of this class entirely.

+  // observers.
+  void SetLoggedInStateAndPrimaryUser(
+      LoggedInState state,
+      LoggedInUserType type,
+      const std::string& primary_user_hash);
+
+  // Sets the logged in state and user type. Also notifies observers. Used
+  // in tests or situations where there is no primary user.
   void SetLoggedInState(LoggedInState state, LoggedInUserType type);
 
-  // Get the logged in user type.
+  // Gets the logged in user type.
   LoggedInUserType GetLoggedInUserType() const;
 
   // Returns true if a user is considered to be logged in.
   bool IsUserLoggedIn() const;
 
   // Returns true if |logged_in_state_| is safe mode (i.e. the user is not yet
   // logged in, and only the owner will be allowed to log in).
   bool IsInSafeMode() const;
 
   // Returns true if logged in and is a guest, retail, or public user.
   bool IsGuestUser() const;
 
   // Returns true if logged in as a kiosk app.
   bool IsKioskApp() const;
 
   // Whether a network profile is created for the user.
   bool UserHasNetworkProfile() const;
 
   // Returns true if the user is an authenticated user (i.e. non public account)
   bool IsUserAuthenticated() const;
 
   // Returns true if the user is authenticated by logging into Google account
   // (i.e., non public nor locally managed account).
   bool IsUserGaiaAuthenticated() const;
 
   void set_always_logged_in(bool always_logged_in) {
     always_logged_in_ = always_logged_in;
   }
 
+  const std::string& primary_user_hash() const { return primary_user_hash_; }
+
  private:
   LoginState();
   virtual ~LoginState();
 
   void NotifyObservers();
 
   LoggedInState logged_in_state_;
   LoggedInUserType logged_in_user_type_;
+  std::string primary_user_hash_;
   ObserverList<Observer> observer_list_;
 
   // If true, it always thinks the current status as logged in. Set to true by
   // default running on a Linux desktop without flags and test cases. To test
   // behaviors with a specific login state, call set_always_logged_in(false).
   bool always_logged_in_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_LOGIN_LOGIN_STATE_H_