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

Unified Diff: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Issue 863063002: Don't allow profile deletion in Metro mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove spurious new lines Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
index 91a5bce179edad88405345fd32f252e11d843bb6..165a3772e3fd286d99ac839d8da5a0e625a4cc70 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
@@ -9,6 +9,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/value_conversions.h"
#include "base/values.h"
+#include "base/win/metro.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/screenlock_private/screenlock_private_api.h"
@@ -633,7 +634,8 @@ void UserManagerScreenHandler::SendUserList() {
base::ListValue users_list;
const ProfileInfoCache& info_cache =
g_browser_process->profile_manager()->GetProfileInfoCache();
-
+ // Profile deletion is not allowed in Metro mode.
+ bool can_remove = !base::win::IsMetroProcess();
tapted 2015/01/26 23:36:07 here too, but this might be shared with ChromeOS,
noms (inactive) 2015/01/28 02:20:13 This is not shared with ChromeOS. This is desktop-
user_auth_type_map_.clear();
for (size_t i = 0; i < info_cache.GetNumberOfProfiles(); ++i) {
@@ -657,7 +659,7 @@ void UserManagerScreenHandler::SendUserList() {
profile_value->SetBoolean(
kKeyNeedsSignin, info_cache.ProfileIsSigninRequiredAtIndex(i));
profile_value->SetBoolean(kKeyIsOwner, false);
- profile_value->SetBoolean(kKeyCanRemove, true);
+ profile_value->SetBoolean(kKeyCanRemove, can_remove);
profile_value->SetBoolean(kKeyIsDesktop, true);
profile_value->SetString(
kKeyAvatarUrl, GetAvatarImageAtIndex(i, info_cache));

Powered by Google App Engine
This is Rietveld 408576698