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

Side by Side Diff: chrome/browser/bookmarks/bookmark_model.cc

Issue 15388002: Supporting high dpi favicons in Instant Extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moving reusable pieces to chrome/common Created 7 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bookmarks/bookmark_model.h" 5 #include "chrome/browser/bookmarks/bookmark_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/bookmarks/bookmark_storage.h" 22 #include "chrome/browser/bookmarks/bookmark_storage.h"
23 #include "chrome/browser/bookmarks/bookmark_utils.h" 23 #include "chrome/browser/bookmarks/bookmark_utils.h"
24 #include "chrome/browser/favicon/favicon_service.h" 24 #include "chrome/browser/favicon/favicon_service.h"
25 #include "chrome/browser/favicon/favicon_service_factory.h" 25 #include "chrome/browser/favicon/favicon_service_factory.h"
26 #include "chrome/browser/favicon/favicon_types.h" 26 #include "chrome/browser/favicon/favicon_types.h"
27 #include "chrome/browser/history/history_notifications.h" 27 #include "chrome/browser/history/history_notifications.h"
28 #include "chrome/browser/history/history_service.h" 28 #include "chrome/browser/history/history_service.h"
29 #include "chrome/browser/history/history_service_factory.h" 29 #include "chrome/browser/history/history_service_factory.h"
30 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
31 #include "chrome/common/chrome_notification_types.h" 31 #include "chrome/common/chrome_notification_types.h"
32 #include "chrome/common/favicon_types.h"
32 #include "content/public/browser/notification_details.h" 33 #include "content/public/browser/notification_details.h"
33 #include "content/public/browser/notification_source.h" 34 #include "content/public/browser/notification_source.h"
34 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
35 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
36 #include "ui/gfx/favicon_size.h" 37 #include "ui/gfx/favicon_size.h"
37 #include "ui/gfx/image/image_util.h" 38 #include "ui/gfx/image/image_util.h"
38 39
39 using base::Time; 40 using base::Time;
40 41
41 namespace { 42 namespace {
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 BookmarkPermanentNode* bb_node = 995 BookmarkPermanentNode* bb_node =
995 CreatePermanentNode(BookmarkNode::BOOKMARK_BAR); 996 CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
996 BookmarkPermanentNode* other_node = 997 BookmarkPermanentNode* other_node =
997 CreatePermanentNode(BookmarkNode::OTHER_NODE); 998 CreatePermanentNode(BookmarkNode::OTHER_NODE);
998 BookmarkPermanentNode* mobile_node = 999 BookmarkPermanentNode* mobile_node =
999 CreatePermanentNode(BookmarkNode::MOBILE); 1000 CreatePermanentNode(BookmarkNode::MOBILE);
1000 return new BookmarkLoadDetails(bb_node, other_node, mobile_node, 1001 return new BookmarkLoadDetails(bb_node, other_node, mobile_node,
1001 new BookmarkIndex(profile_), 1002 new BookmarkIndex(profile_),
1002 next_node_id_); 1003 next_node_id_);
1003 } 1004 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698