Make us save favicon in incognito mode if the url is bookmarked. This

chrome/browser/fav_icon_helper.cc

 // Copyright (c) 2010 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/fav_icon_helper.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/ref_counted_memory.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "gfx/codec/png_codec.h"
 #include "gfx/favicon_size.h"
 #include "skia/ext/image_operations.h"
 
@@ skipping 48 matching lines @@
 }
 
 void FavIconHelper::SetFavIcon(
     const GURL& url,
     const GURL& image_url,
     const SkBitmap& image) {
   const SkBitmap& sized_image =
       (image.width() == kFavIconSize && image.height() == kFavIconSize)
       ? image : ConvertToFavIconSize(image);
 
-  if (GetFaviconService() && !profile()->IsOffTheRecord()) {
+  if (GetFaviconService() && ShouldSaveFavicon(url)) {
     std::vector<unsigned char> image_data;
     gfx::PNGCodec::EncodeBGRASkBitmap(sized_image, false, &image_data);
     GetFaviconService()->SetFavicon(url, image_url, image_data);
   }
 
   if (url == url_) {
     NavigationEntry* entry = GetEntry();
     if (entry)
       UpdateFavIcon(entry, sized_image);
   }
@@ skipping 197 matching lines @@
   int width = image.width();
   int height = image.height();
   if (width > 0 && height > 0) {
     calc_favicon_target_size(&width, &height);
     return skia::ImageOperations::Resize(
           image, skia::ImageOperations::RESIZE_LANCZOS3,
           width, height);
   }
   return image;
 }
+
+bool FavIconHelper::ShouldSaveFavicon(const GURL& url) {
+  if (!profile()->IsOffTheRecord())
+    return true;
+
+  // Otherwise store the favicon if the page is bookmarked.
+  BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
+  return bookmark_model && bookmark_model->IsBookmarked(url);
+}