Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: chrome/browser/chromeos/login/user.h

Issue 221873005: Some cleanup of WallpaperManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 OAUTH2_TOKEN_STATUS_VALID = 4, 100 OAUTH2_TOKEN_STATUS_VALID = 4,
101 } OAuthTokenStatus; 101 } OAuthTokenStatus;
102 102
103 // Returned as |image_index| when user-selected file or photo is used as 103 // Returned as |image_index| when user-selected file or photo is used as
104 // user image. 104 // user image.
105 static const int kExternalImageIndex = -1; 105 static const int kExternalImageIndex = -1;
106 // Returned as |image_index| when user profile image is used as user image. 106 // Returned as |image_index| when user profile image is used as user image.
107 static const int kProfileImageIndex = -2; 107 static const int kProfileImageIndex = -2;
108 static const int kInvalidImageIndex = -3; 108 static const int kInvalidImageIndex = -3;
109 109
110 enum WallpaperType { 110 enum WallpaperType {
bshe 2014/04/02 15:11:10 Could you document the removed enum please? This e
Thiemo Nagel 2014/04/02 15:39:56 Done.
111 DAILY = 0, 111 CUSTOMIZED = 1, // Selected by user.
bshe 2014/04/02 15:11:10 nit: Selected by user or Google pushed wallpaper.
Thiemo Nagel 2014/04/02 15:39:56 How can Google push a wallpaper? Are you referrin
112 CUSTOMIZED = 1, 112 DEFAULT = 2, // Default.
113 DEFAULT = 2,
114 UNKNOWN = 3, 113 UNKNOWN = 3,
115 ONLINE = 4, 114 ONLINE = 4, // WallpaperInfo.file denotes an URL.
116 POLICY = 5, // Controlled by policy, can't be changed by the user. 115 POLICY = 5, // Controlled by policy, can't be changed by the user.
117 WALLPAPER_TYPE_COUNT = 6 116 WALLPAPER_TYPE_COUNT = 6
118 }; 117 };
119 118
120 // Returns the user type. 119 // Returns the user type.
121 virtual UserType GetType() const = 0; 120 virtual UserType GetType() const = 0;
122 121
123 // The email the user used to log in. 122 // The email the user used to log in.
124 const std::string& email() const { return email_; } 123 const std::string& email() const { return email_; }
125 124
126 // Returns the human name to display for this user. 125 // Returns the human name to display for this user.
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 319
321 DISALLOW_COPY_AND_ASSIGN(User); 320 DISALLOW_COPY_AND_ASSIGN(User);
322 }; 321 };
323 322
324 // List of known users. 323 // List of known users.
325 typedef std::vector<User*> UserList; 324 typedef std::vector<User*> UserList;
326 325
327 } // namespace chromeos 326 } // namespace chromeos
328 327
329 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_ 328 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/user_manager_impl.h » ('j') | chrome/browser/chromeos/login/wallpaper_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698