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

Side by Side Diff: chrome/browser/jumplist_win.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/jumplist_win.h" 5 #include "chrome/browser/jumplist_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shobjidl.h> 8 #include <shobjidl.h>
9 #include <propkey.h> 9 #include <propkey.h>
10 #include <propvarutil.h> 10 #include <propvarutil.h>
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/history/page_usage_data.h" 30 #include "chrome/browser/history/page_usage_data.h"
31 #include "chrome/browser/history/top_sites.h" 31 #include "chrome/browser/history/top_sites.h"
32 #include "chrome/browser/profiles/profile.h" 32 #include "chrome/browser/profiles/profile.h"
33 #include "chrome/browser/sessions/session_types.h" 33 #include "chrome/browser/sessions/session_types.h"
34 #include "chrome/browser/sessions/tab_restore_service.h" 34 #include "chrome/browser/sessions/tab_restore_service.h"
35 #include "chrome/browser/sessions/tab_restore_service_factory.h" 35 #include "chrome/browser/sessions/tab_restore_service_factory.h"
36 #include "chrome/browser/shell_integration.h" 36 #include "chrome/browser/shell_integration.h"
37 #include "chrome/common/chrome_constants.h" 37 #include "chrome/common/chrome_constants.h"
38 #include "chrome/common/chrome_notification_types.h" 38 #include "chrome/common/chrome_notification_types.h"
39 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
40 #include "chrome/common/favicon_types.h"
40 #include "chrome/common/url_constants.h" 41 #include "chrome/common/url_constants.h"
41 #include "content/public/browser/browser_thread.h" 42 #include "content/public/browser/browser_thread.h"
42 #include "content/public/browser/notification_source.h" 43 #include "content/public/browser/notification_source.h"
43 #include "googleurl/src/gurl.h" 44 #include "googleurl/src/gurl.h"
44 #include "grit/chromium_strings.h" 45 #include "grit/chromium_strings.h"
45 #include "grit/generated_resources.h" 46 #include "grit/generated_resources.h"
46 #include "third_party/skia/include/core/SkBitmap.h" 47 #include "third_party/skia/include/core/SkBitmap.h"
47 #include "ui/base/l10n/l10n_util.h" 48 #include "ui/base/l10n/l10n_util.h"
48 #include "ui/gfx/codec/png_codec.h" 49 #include "ui/gfx/codec/png_codec.h"
49 #include "ui/gfx/favicon_size.h" 50 #include "ui/gfx/favicon_size.h"
(...skipping 705 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 } 756 }
756 757
757 void JumpList::CreateIconFiles(const ShellLinkItemList& item_list) { 758 void JumpList::CreateIconFiles(const ShellLinkItemList& item_list) {
758 for (ShellLinkItemList::const_iterator item = item_list.begin(); 759 for (ShellLinkItemList::const_iterator item = item_list.begin();
759 item != item_list.end(); ++item) { 760 item != item_list.end(); ++item) {
760 base::FilePath icon_path; 761 base::FilePath icon_path;
761 if (CreateIconFile((*item)->data(), icon_dir_, &icon_path)) 762 if (CreateIconFile((*item)->data(), icon_dir_, &icon_path))
762 (*item)->SetIcon(icon_path.value(), 0, true); 763 (*item)->SetIcon(icon_path.value(), 0, true);
763 } 764 }
764 } 765 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698