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

Side by Side Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 494973003: Disable checkboxes in the advanced sync settings overlay whose type is force-enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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 #include "chrome/browser/ui/webui/sync_setup_handler.h" 5 #include "chrome/browser/ui/webui/sync_setup_handler.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 // passwords) 350 // passwords)
351 // usePassphrase: true if the data is encrypted with a secondary passphrase 351 // usePassphrase: true if the data is encrypted with a secondary passphrase
352 // show_passphrase: true if a passphrase is needed to decrypt the sync data 352 // show_passphrase: true if a passphrase is needed to decrypt the sync data
353 base::DictionaryValue args; 353 base::DictionaryValue args;
354 354
355 // Tell the UI layer which data types are registered/enabled by the user. 355 // Tell the UI layer which data types are registered/enabled by the user.
356 const syncer::ModelTypeSet registered_types = 356 const syncer::ModelTypeSet registered_types =
357 service->GetRegisteredDataTypes(); 357 service->GetRegisteredDataTypes();
358 const syncer::ModelTypeSet preferred_types = 358 const syncer::ModelTypeSet preferred_types =
359 service->GetPreferredDataTypes(); 359 service->GetPreferredDataTypes();
360 const syncer::ModelTypeSet enforced_types =
361 service->GetNonUserChoicePreferredDataTypes();
360 ModelTypeNameMap type_names = GetSelectableTypeNameMap(); 362 ModelTypeNameMap type_names = GetSelectableTypeNameMap();
361 for (ModelTypeNameMap::const_iterator it = type_names.begin(); 363 for (ModelTypeNameMap::const_iterator it = type_names.begin();
362 it != type_names.end(); ++it) { 364 it != type_names.end(); ++it) {
363 syncer::ModelType sync_type = it->first; 365 syncer::ModelType sync_type = it->first;
364 const std::string key_name = it->second; 366 const std::string key_name = it->second;
365 args.SetBoolean(key_name + "Registered", 367 args.SetBoolean(key_name + "Registered", registered_types.Has(sync_type));
366 registered_types.Has(sync_type));
367 args.SetBoolean(key_name + "Synced", preferred_types.Has(sync_type)); 368 args.SetBoolean(key_name + "Synced", preferred_types.Has(sync_type));
369 args.SetBoolean(key_name + "Enforced", enforced_types.Has(sync_type));
370 // TODO(treib): How do we want to handle pref groups, i.e. when only some of
371 // the sync types behind a checkbox are force-enabled? crbug.com/403326
368 } 372 }
369 sync_driver::SyncPrefs sync_prefs(GetProfile()->GetPrefs()); 373 sync_driver::SyncPrefs sync_prefs(GetProfile()->GetPrefs());
370 args.SetBoolean("passphraseFailed", passphrase_failed); 374 args.SetBoolean("passphraseFailed", passphrase_failed);
371 args.SetBoolean("showSyncEverythingPage", !show_advanced); 375 args.SetBoolean("showSyncEverythingPage", !show_advanced);
372 args.SetBoolean("syncAllDataTypes", sync_prefs.HasKeepEverythingSynced()); 376 args.SetBoolean("syncAllDataTypes", sync_prefs.HasKeepEverythingSynced());
373 args.SetBoolean("syncNothing", false); // Always false during initial setup. 377 args.SetBoolean("syncNothing", false); // Always false during initial setup.
374 args.SetBoolean("encryptAllData", service->EncryptEverythingEnabled()); 378 args.SetBoolean("encryptAllData", service->EncryptEverythingEnabled());
375 args.SetBoolean("isSupervised", GetProfile()->IsSupervised()); 379 args.SetBoolean("isSupervised", GetProfile()->IsSupervised());
376 380
377 // We call IsPassphraseRequired() here, instead of calling 381 // We call IsPassphraseRequired() here, instead of calling
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 960
957 LoginUIService* service = GetLoginUIService(); 961 LoginUIService* service = GetLoginUIService();
958 DCHECK(service); 962 DCHECK(service);
959 service->current_login_ui()->FocusUI(); 963 service->current_login_ui()->FocusUI();
960 return true; 964 return true;
961 } 965 }
962 966
963 LoginUIService* SyncSetupHandler::GetLoginUIService() const { 967 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
964 return LoginUIServiceFactory::GetForProfile(GetProfile()); 968 return LoginUIServiceFactory::GetForProfile(GetProfile());
965 } 969 }
OLDNEW
« chrome/browser/sync/profile_sync_service.cc ('K') | « chrome/browser/sync/profile_sync_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698