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

Side by Side Diff: chrome/browser/chromeos/preferences.cc

Issue 2459823002: [Sync] Rename syncable_prefs to sync_preferences. (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chromeos/preferences.h" 5 #include "chrome/browser/chromeos/preferences.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/autoclick/autoclick_controller.h" 9 #include "ash/autoclick/autoclick_controller.h"
10 #include "ash/common/accessibility_types.h" 10 #include "ash/common/accessibility_types.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
35 #include "chromeos/chromeos_switches.h" 35 #include "chromeos/chromeos_switches.h"
36 #include "chromeos/system/statistics_provider.h" 36 #include "chromeos/system/statistics_provider.h"
37 #include "chromeos/timezone/timezone_resolver.h" 37 #include "chromeos/timezone/timezone_resolver.h"
38 #include "components/drive/drive_pref_names.h" 38 #include "components/drive/drive_pref_names.h"
39 #include "components/feedback/tracing_manager.h" 39 #include "components/feedback/tracing_manager.h"
40 #include "components/pref_registry/pref_registry_syncable.h" 40 #include "components/pref_registry/pref_registry_syncable.h"
41 #include "components/prefs/pref_member.h" 41 #include "components/prefs/pref_member.h"
42 #include "components/prefs/pref_registry_simple.h" 42 #include "components/prefs/pref_registry_simple.h"
43 #include "components/prefs/scoped_user_pref_update.h" 43 #include "components/prefs/scoped_user_pref_update.h"
44 #include "components/syncable_prefs/pref_service_syncable.h" 44 #include "components/sync_preferences/pref_service_syncable.h"
45 #include "components/user_manager/known_user.h" 45 #include "components/user_manager/known_user.h"
46 #include "components/user_manager/user.h" 46 #include "components/user_manager/user.h"
47 #include "components/user_manager/user_manager.h" 47 #include "components/user_manager/user_manager.h"
48 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
49 #include "third_party/cros_system_api/dbus/update_engine/dbus-constants.h" 49 #include "third_party/cros_system_api/dbus/update_engine/dbus-constants.h"
50 #include "third_party/icu/source/i18n/unicode/timezone.h" 50 #include "third_party/icu/source/i18n/unicode/timezone.h"
51 #include "ui/base/ime/chromeos/extension_ime_util.h" 51 #include "ui/base/ime/chromeos/extension_ime_util.h"
52 #include "ui/base/ime/chromeos/ime_keyboard.h" 52 #include "ui/base/ime/chromeos/ime_keyboard.h"
53 #include "ui/base/ime/chromeos/input_method_manager.h" 53 #include "ui/base/ime/chromeos/input_method_manager.h"
54 #include "ui/events/event_constants.h" 54 #include "ui/events/event_constants.h"
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 registry->RegisterBooleanPref(prefs::kQuickUnlockFeatureNotificationShown, 340 registry->RegisterBooleanPref(prefs::kQuickUnlockFeatureNotificationShown,
341 false); 341 false);
342 342
343 // We don't sync EOL related prefs because they are device specific. 343 // We don't sync EOL related prefs because they are device specific.
344 registry->RegisterBooleanPref(prefs::kEolNotificationDismissed, false); 344 registry->RegisterBooleanPref(prefs::kEolNotificationDismissed, false);
345 registry->RegisterIntegerPref(prefs::kEolStatus, 345 registry->RegisterIntegerPref(prefs::kEolStatus,
346 update_engine::EndOfLifeStatus::kSupported); 346 update_engine::EndOfLifeStatus::kSupported);
347 } 347 }
348 348
349 void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) { 349 void Preferences::InitUserPrefs(sync_preferences::PrefServiceSyncable* prefs) {
350 prefs_ = prefs; 350 prefs_ = prefs;
351 351
352 BooleanPrefMember::NamedChangeCallback callback = 352 BooleanPrefMember::NamedChangeCallback callback =
353 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); 353 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this));
354 354
355 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, 355 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled,
356 prefs, callback); 356 prefs, callback);
357 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback); 357 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback);
358 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback); 358 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback);
359 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, 359 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 callback); 393 callback);
394 394
395 pref_change_registrar_.Init(prefs); 395 pref_change_registrar_.Init(prefs);
396 pref_change_registrar_.Add(prefs::kResolveTimezoneByGeolocation, callback); 396 pref_change_registrar_.Add(prefs::kResolveTimezoneByGeolocation, callback);
397 pref_change_registrar_.Add(prefs::kUse24HourClock, callback); 397 pref_change_registrar_.Add(prefs::kUse24HourClock, callback);
398 } 398 }
399 399
400 void Preferences::Init(Profile* profile, const user_manager::User* user) { 400 void Preferences::Init(Profile* profile, const user_manager::User* user) {
401 DCHECK(profile); 401 DCHECK(profile);
402 DCHECK(user); 402 DCHECK(user);
403 syncable_prefs::PrefServiceSyncable* prefs = 403 sync_preferences::PrefServiceSyncable* prefs =
404 PrefServiceSyncableFromProfile(profile); 404 PrefServiceSyncableFromProfile(profile);
405 // This causes OnIsSyncingChanged to be called when the value of 405 // This causes OnIsSyncingChanged to be called when the value of
406 // PrefService::IsSyncing() changes. 406 // PrefService::IsSyncing() changes.
407 prefs->AddObserver(this); 407 prefs->AddObserver(this);
408 user_ = user; 408 user_ = user;
409 user_is_primary_ = 409 user_is_primary_ =
410 user_manager::UserManager::Get()->GetPrimaryUser() == user_; 410 user_manager::UserManager::Get()->GetPrimaryUser() == user_;
411 InitUserPrefs(prefs); 411 InitUserPrefs(prefs);
412 412
413 user_manager::UserManager::Get()->AddSessionStateObserver(this); 413 user_manager::UserManager::Get()->AddSessionStateObserver(this);
(...skipping 23 matching lines...) Expand all
437 437
438 // If a guest is logged in, initialize the prefs as if this is the first 438 // If a guest is logged in, initialize the prefs as if this is the first
439 // login. For a regular user this is done in 439 // login. For a regular user this is done in
440 // UserSessionManager::InitProfilePreferences(). 440 // UserSessionManager::InitProfilePreferences().
441 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 441 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
442 switches::kGuestSession)) 442 switches::kGuestSession))
443 session_manager->SetFirstLoginPrefs(profile, std::string(), std::string()); 443 session_manager->SetFirstLoginPrefs(profile, std::string(), std::string());
444 } 444 }
445 445
446 void Preferences::InitUserPrefsForTesting( 446 void Preferences::InitUserPrefsForTesting(
447 syncable_prefs::PrefServiceSyncable* prefs, 447 sync_preferences::PrefServiceSyncable* prefs,
448 const user_manager::User* user, 448 const user_manager::User* user,
449 scoped_refptr<input_method::InputMethodManager::State> ime_state) { 449 scoped_refptr<input_method::InputMethodManager::State> ime_state) {
450 user_ = user; 450 user_ = user;
451 ime_state_ = ime_state; 451 ime_state_ = ime_state;
452 452
453 if (ime_state.get()) 453 if (ime_state.get())
454 input_method_manager_->SetState(ime_state); 454 input_method_manager_->SetState(ime_state);
455 455
456 InitUserPrefs(prefs); 456 InitUserPrefs(prefs);
457 457
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 touch_hud_projection_enabled_.SetValue(enabled); 792 touch_hud_projection_enabled_.SetValue(enabled);
793 } 793 }
794 794
795 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { 795 void Preferences::ActiveUserChanged(const user_manager::User* active_user) {
796 if (active_user != user_) 796 if (active_user != user_)
797 return; 797 return;
798 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); 798 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, "");
799 } 799 }
800 800
801 } // namespace chromeos 801 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/chromeos/preferences_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698