Some cleanup of WallpaperManager.

chrome/browser/chromeos/login/user.h

 // Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 89 matching lines @@
      OAUTH2_TOKEN_STATUS_VALID   = 4,
   } OAuthTokenStatus;
 
   // Returned as |image_index| when user-selected file or photo is used as
   // user image.
   static const int kExternalImageIndex = -1;
   // Returned as |image_index| when user profile image is used as user image.
   static const int kProfileImageIndex = -2;
   static const int kInvalidImageIndex = -3;
 
+  // Enum values 0 and 3 have been removed.  Do not re-use them!

[Nikita (slow), 2014/04/18 09:28:19]

nit: How about using this syntax:
This way it is more clear what these indices were used for.

 /* DAILY = 0 */  // Removed.  Do not re-use the id!

 /* UNKNOWN = 3 */  // Removed.  Do not re-use the id!

[Thiemo Nagel, 2014/04/23 17:14:06]

Done.  (I had modeled the syntax after that of the OAuthTokenStatus enum, but I
don't mind either way.)

   enum WallpaperType {
-    DAILY = 0,
-    CUSTOMIZED = 1,
-    DEFAULT = 2,
-    /* UNKNOWN = 3 */  // Removed.  Do not re-use the id!
-    ONLINE = 4,
-    POLICY = 5,        // Controlled by policy, can't be changed by the user.
+    CUSTOMIZED = 1,  // Selected by user.
+    DEFAULT = 2,     // Default.
+    ONLINE = 4,      // WallpaperInfo.file denotes an URL.
+    POLICY = 5,      // Controlled by policy, can't be changed by the user.
     WALLPAPER_TYPE_COUNT = 6
   };
 
   // Returns the user type.
   virtual UserType GetType() const = 0;
 
   // The email the user used to log in.
   const std::string& email() const { return email_; }
 
   // Returns the human name to display for this user.
@@ skipping 193 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_