wip

chrome/browser/sync/glue/session_model_associator.cc

 // Copyright (c) 2012 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/sync/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 582 matching lines @@
     if (tab_node.InitByIdLookup(tab_link->sync_id()) !=
             syncer::BaseNode::INIT_OK) {
       LOG(WARNING) << "Failed to load sync tab node for tab id " << tab_id
                    << " and url " << tab_link->url().spec();
       return;
     }
     sync_pb::SessionSpecifics session_specifics =
         tab_node.GetSessionSpecifics();
     DCHECK(session_specifics.has_tab());
     sync_pb::SessionTab* tab = session_specifics.mutable_tab();
-    if (favicon.bitmap_data->size() > 0) {
+    if (favicon.variants.size() > 0 &&
+        favicon.variants[0].bitmap_data->size() > 0) {
       DVLOG(1) << "Storing session favicon for "
                << tab_link->url() << " with size "
-               << favicon.bitmap_data->size() << " bytes.";
-      tab->set_favicon(favicon.bitmap_data->front(),
-                       favicon.bitmap_data->size());
+               << favicon.variants[0].bitmap_data->size() << " bytes.";
+      tab->set_favicon(favicon.variants[0].bitmap_data->front(),
+                       favicon.variants[0].bitmap_data->size());
       tab->set_favicon_type(sync_pb::SessionTab::TYPE_WEB_FAVICON);
       tab->set_favicon_source(favicon.icon_url.spec());
     } else {
       LOG(WARNING) << "Null favicon stored for url " << tab_link->url().spec();
     }
     tab_node.SetSessionSpecifics(session_specifics);
   } else {
     // Else the favicon either isn't loaded yet or there is no favicon. We
     // deliberately don't clear the tab_link's favicon_load_handle so we know
     // that we're still waiting for a favicon. ReceivedFavicons(..) below will
@@ skipping 977 matching lines @@
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncer::ModelTypeSet encrypted_types =
       syncer::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync