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

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

Issue 209433005: Use same icon set to be consistent in Files.app and Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase onto head. Created 6 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
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/icon_loader.h" 5 #include "chrome/browser/icon_loader.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // extension. 47 // extension.
48 int Lookup(const std::string& extension, IconLoader::IconSize icon_size); 48 int Lookup(const std::string& extension, IconLoader::IconSize icon_size);
49 49
50 private: 50 private:
51 typedef std::map<std::string, IdrBySize> ExtensionIconMap; 51 typedef std::map<std::string, IdrBySize> ExtensionIconMap;
52 52
53 ExtensionIconMap extension_icon_map_; 53 ExtensionIconMap extension_icon_map_;
54 }; 54 };
55 55
56 const IdrBySize kAudioIdrs = { 56 const IdrBySize kAudioIdrs = {
57 IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO, 57 IDR_FILETYPE_AUDIO,
58 IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO, 58 IDR_FILETYPE_LARGE_AUDIO,
59 IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO 59 IDR_FILETYPE_LARGE_AUDIO
60 }; 60 };
61 const IdrBySize kGenericIdrs = { 61 const IdrBySize kGenericIdrs = {
62 IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC, 62 IDR_FILETYPE_GENERIC,
63 IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC, 63 IDR_FILETYPE_LARGE_GENERIC,
64 IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC 64 IDR_FILETYPE_LARGE_GENERIC
65 }; 65 };
66 const IdrBySize kImageIdrs = { 66 const IdrBySize kImageIdrs = {
67 IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE, 67 IDR_FILETYPE_IMAGE,
68 IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE, 68 IDR_FILETYPE_IMAGE,
69 IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE 69 IDR_FILETYPE_IMAGE
70 }; 70 };
71 #if defined(USE_PROPRIETARY_CODECS) 71 #if defined(USE_PROPRIETARY_CODECS)
72 const IdrBySize kPdfIdrs = { 72 const IdrBySize kPdfIdrs = {
73 IDR_FILE_MANAGER_IMG_FILETYPE_PDF, 73 IDR_FILETYPE_PDF,
74 IDR_FILE_MANAGER_IMG_FILETYPE_PDF, 74 IDR_FILETYPE_PDF,
75 IDR_FILE_MANAGER_IMG_FILETYPE_PDF 75 IDR_FILETYPE_PDF
76 }; 76 };
77 #endif 77 #endif
78 const IdrBySize kVideoIdrs = { 78 const IdrBySize kVideoIdrs = {
79 IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO, 79 IDR_FILETYPE_VIDEO,
80 IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO, 80 IDR_FILETYPE_LARGE_VIDEO,
81 IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO 81 IDR_FILETYPE_LARGE_VIDEO
82 }; 82 };
83 83
84 IconMapper::IconMapper() { 84 IconMapper::IconMapper() {
85 // The code below should match translation in 85 // The code below should match translation in
86 // chrome/browser/resources/file_manager/js/file_manager.js 86 // chrome/browser/resources/file_manager/js/file_manager.js
87 // chrome/browser/resources/file_manager/css/file_manager.css 87 // chrome/browser/resources/file_manager/css/file_manager.css
88 // 'audio': /\.(mp3|m4a|oga|ogg|wav)$/i, 88 // 'audio': /\.(mp3|m4a|oga|ogg|wav)$/i,
89 // 'html': /\.(html?)$/i, 89 // 'html': /\.(html?)$/i,
90 // 'image': /\.(bmp|gif|jpe?g|ico|png|webp)$/i, 90 // 'image': /\.(bmp|gif|jpe?g|ico|png|webp)$/i,
91 // 'pdf' : /\.(pdf)$/i, 91 // 'pdf' : /\.(pdf)$/i,
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 LAZY_INSTANCE_INITIALIZER; 201 LAZY_INSTANCE_INITIALIZER;
202 int idr = icon_mapper.Get().Lookup(group_, icon_size_); 202 int idr = icon_mapper.Get().Lookup(group_, icon_size_);
203 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 203 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
204 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(), 204 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(),
205 IconSizeToDIPSize(icon_size_))); 205 IconSizeToDIPSize(icon_size_)));
206 image_skia.MakeThreadSafe(); 206 image_skia.MakeThreadSafe();
207 image_.reset(new gfx::Image(image_skia)); 207 image_.reset(new gfx::Image(image_skia));
208 target_message_loop_->PostTask( 208 target_message_loop_->PostTask(
209 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); 209 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
210 } 210 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/resources/file_manager/common/images/file_types/100/archive.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698