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

Side by Side Diff: chrome/browser/favicon_helper.cc

Issue 6814029: Revert 80519 - Move favicon from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/favicon_helper.h ('k') | chrome/browser/favicon_tab_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/favicon_helper.h" 5 #include "chrome/browser/favicon_helper.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 } 306 }
307 307
308 bool FaviconHelper::ShouldSaveFavicon(const GURL& url) { 308 bool FaviconHelper::ShouldSaveFavicon(const GURL& url) {
309 if (!profile()->IsOffTheRecord()) 309 if (!profile()->IsOffTheRecord())
310 return true; 310 return true;
311 311
312 // Otherwise store the favicon if the page is bookmarked. 312 // Otherwise store the favicon if the page is bookmarked.
313 BookmarkModel* bookmark_model = profile()->GetBookmarkModel(); 313 BookmarkModel* bookmark_model = profile()->GetBookmarkModel();
314 return bookmark_model && bookmark_model->IsBookmarked(url); 314 return bookmark_model && bookmark_model->IsBookmarked(url);
315 } 315 }
OLDNEW
« no previous file with comments | « chrome/browser/favicon_helper.h ('k') | chrome/browser/favicon_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698