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

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 2060623002: Implementation of Device End of Life Notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modify browsertest Created 4 years, 6 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/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 9e157c5cd436602ec7aef236f2e28108b463b15f..23babb242e026967582a1324e31818fb542b3c9b 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/chromeos/eol_notification.h"
xiyuan 2016/06/16 22:41:28 seems not needed.
xiaoyinh(OOO Sep 11-29) 2016/06/17 04:07:35 Removed.
#include "chrome/browser/chromeos/input_method/input_method_syncer.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
#include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
@@ -45,6 +46,7 @@
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
+#include "third_party/cros_system_api/dbus/update_engine/dbus-constants.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
#include "ui/base/ime/chromeos/extension_ime_util.h"
#include "ui/base/ime/chromeos/ime_keyboard.h"
@@ -316,6 +318,11 @@ void Preferences::RegisterProfilePrefs(
registry->RegisterInt64Pref(prefs::kHatsLastInteractionTimestamp,
base::Time().ToInternalValue());
+
+ // We don't sync EOL related prefs because they are device specific.
+ registry->RegisterBooleanPref(prefs::kEolNotificationDismissed, false);
+ registry->RegisterIntegerPref(prefs::kEolStatus,
+ update_engine::EndOfLifeStatus::kSupported);
}
void Preferences::InitUserPrefs(syncable_prefs::PrefServiceSyncable* prefs) {

Powered by Google App Engine
This is Rietveld 408576698