Save the oauth client id used in App Notification setup

chrome/browser/extensions/extension_prefs.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_prefs.h"
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
@@ skipping 27 matching lines @@
 
 // The dictionary containing the extension's manifest.
 const char kPrefManifest[] = "manifest";
 
 // The version number.
 const char kPrefVersion[] = "manifest.version";
 
 // Indicates whether an extension is blacklisted.
 const char kPrefBlacklist[] = "blacklist";
 
-// Indicates whether the user has done app notifications setup or not.
-const char kPrefAppNotificationSetup[] = "app_notif_setup";
+// The oauth client id used for app notification setup.
+const char kPrefAppNotificationClientId[] = "app_notif_client_id";
 
 // Indicates whether the user has disabled notifications or not.
 const char kPrefAppNotificationDisbaled[] = "app_notif_disabled";
 
 // Indicates whether the user has acknowledged various types of extensions.
 const char kPrefExternalAcknowledged[] = "ack_external";
 const char kPrefBlacklistAcknowledged[] = "ack_blacklist";
 const char kPrefOrphanAcknowledged[] = "ack_orphan";
 
 // Indicates whether to show an install warning when the user enables.
@@ skipping 525 matching lines @@
 }
 
 bool ExtensionPrefs::SetAlertSystemFirstRun() {
   if (prefs_->GetBoolean(prefs::kExtensionAlertsInitializedPref)) {
     return true;
   }
   prefs_->SetBoolean(prefs::kExtensionAlertsInitializedPref, true);
   return false;
 }
 
-bool ExtensionPrefs::IsAppNotificationSetupDone(
+std::string ExtensionPrefs::AppNotificationClientId(

[Munjal (Google), 2011/11/29 21:55:34]

Nit: AppNotificationClientId to GetAppNotificationClientId?

[asargent_no_longer_on_chrome, 2011/11/30 06:06:20]

Done. 

I was ambivalent about this when writing the code initially because some other
functions in this file follow the pattern of Foo/SetFoo, but others follow
GetFoo/SetFoo. 

     const std::string& extension_id) const {
-  return ReadExtensionPrefBoolean(
-      extension_id, kPrefAppNotificationSetup);
+  const DictionaryValue* dict = GetExtensionPref(extension_id);
+  if (!dict || !dict->HasKey(kPrefAppNotificationClientId))
+    return std::string();
+
+  std::string tmp;
+  dict->GetString(kPrefAppNotificationClientId, &tmp);
+  return tmp;
 }
 
-void ExtensionPrefs::SetAppNotificationSetupDone(
+void ExtensionPrefs::SetAppNotificationClientId(
     const std::string& extension_id,
-    bool value) {
+    const std::string& oauth_client_id) {
   DCHECK(Extension::IdIsValid(extension_id));
-  UpdateExtensionPref(extension_id, kPrefAppNotificationSetup,
-                      Value::CreateBooleanValue(value));
+  UpdateExtensionPref(extension_id, kPrefAppNotificationClientId,
+                      Value::CreateStringValue(oauth_client_id));
 }
 
 bool ExtensionPrefs::IsAppNotificationDisabled(
     const std::string& extension_id) const {
   return ReadExtensionPrefBoolean(extension_id, kPrefAppNotificationDisbaled);
 }
 
 void ExtensionPrefs::SetAppNotificationDisabled(
    const std::string& extension_id, bool value) {
   DCHECK(Extension::IdIsValid(extension_id));
@@ skipping 1205 matching lines @@
   prefs->RegisterListPref(prefs::kExtensionInstallAllowList,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kExtensionInstallDenyList,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(prefs::kExtensionInstallForceList,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(kWebStoreLogin,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
 }