[Sync] Cache encrypted types info in ProfileSyncService

chrome/browser/sync/profile_sync_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <string>
@@ skipping 191 matching lines @@
       const browser_sync::WeakHandle<browser_sync::JsBackend>& js_backend,
       bool success) OVERRIDE;
   virtual void OnSyncCycleCompleted() OVERRIDE;
   virtual void OnAuthError() OVERRIDE;
   virtual void OnStopSyncingPermanently() OVERRIDE;
   virtual void OnClearServerDataFailed() OVERRIDE;
   virtual void OnClearServerDataSucceeded() OVERRIDE;
   virtual void OnPassphraseRequired(
       sync_api::PassphraseRequiredReason reason) OVERRIDE;
   virtual void OnPassphraseAccepted() OVERRIDE;
-  virtual void OnEncryptionComplete(
-      const syncable::ModelTypeSet& encrypted_types) OVERRIDE;
+  virtual void OnEncryptedTypesChanged(
+      const syncable::ModelTypeSet& enncrypted_types,
+      bool encrypt_everything) OVERRIDE;
+  virtual void OnEncryptionComplete() OVERRIDE;
   virtual void OnMigrationNeededForTypes(
       const syncable::ModelTypeSet& types) OVERRIDE;
   virtual void OnDataTypesChanged(
       const syncable::ModelTypeSet& to_add) OVERRIDE;
   virtual void OnActionableError(
       const browser_sync::SyncProtocolError& error) OVERRIDE;
 
   void OnClearServerDataTimeout();
 
   // Called when a user enters credentials through UI.
@@ skipping 439 matching lines @@
   // Keep track of where we are in a server clear operation
   ClearServerDataState clear_server_data_state_;
 
   // Timeout for the clear data command.  This timeout is a temporary hack
   // and is necessary because the nudge sync framework can drop nudges for
   // a wide variety of sync-related conditions (throttling, connections issues,
   // syncer paused, etc.).  It can only be removed correctly when the framework
   // is reworked to allow one-shot commands like clearing server data.
   base::OneShotTimer<ProfileSyncService> clear_server_data_timer_;
 
+  // The set of encrypted types and whether or not we want to encrypt
+  // everything.  Initialized on OnBackendInitialized and updated by

[Nicolas Zea, 2011/10/21 14:29:07]

Perhaps include a comment that the Cryptographer::SensitiveTypes will always be
part of the set of encrypted types.

[akalin, 2011/10/22 03:28:38]

Done.

+  // OnEncryptionComplete.
+  syncable::ModelTypeSet encrypted_types_;
+  bool encrypt_everything_;
+
   // Whether we're waiting for an attempt to encryption all sync data to
   // complete. We track this at this layer in order to allow the user to cancel
   // if they e.g. don't remember their explicit passphrase.
   bool encryption_pending_;
 
   // If true, we want to automatically start sync signin whenever we have
   // credentials (user doesn't need to go through the startup flow). This is
   // typically enabled on platforms (like ChromeOS) that have their own
   // distinct signin flow.
   bool auto_start_enabled_;
@@ skipping 11 matching lines @@
   FailedDatatypesHandler failed_datatypes_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const browser_sync::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_