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

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

Issue 250383003: Adjust to the new Files.app path in comment and watchlist. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | 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/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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 }; 76 };
77 #endif 77 #endif
78 const IdrBySize kVideoIdrs = { 78 const IdrBySize kVideoIdrs = {
79 IDR_FILETYPE_VIDEO, 79 IDR_FILETYPE_VIDEO,
80 IDR_FILETYPE_LARGE_VIDEO, 80 IDR_FILETYPE_LARGE_VIDEO,
81 IDR_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 // ui/file_manager/file_manager/js/file_manager.js
87 // chrome/browser/resources/file_manager/css/file_manager.css 87 // ui/file_manager/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,
92 // 'text': /\.(pod|rst|txt|log)$/i, 92 // 'text': /\.(pod|rst|txt|log)$/i,
93 // 'video': /\.(mov|mp4|m4v|mpe?g4?|ogm|ogv|ogx|webm)$/i 93 // 'video': /\.(mov|mp4|m4v|mpe?g4?|ogm|ogv|ogx|webm)$/i
94 94
95 const ExtensionIconMap::value_type kExtensionIdrBySizeData[] = { 95 const ExtensionIconMap::value_type kExtensionIdrBySizeData[] = {
96 #if defined(USE_PROPRIETARY_CODECS) 96 #if defined(USE_PROPRIETARY_CODECS)
97 std::make_pair(".m4a", kAudioIdrs), 97 std::make_pair(".m4a", kAudioIdrs),
(...skipping 103 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/browser/chromeos/file_manager/file_tasks.h ('k') | chrome/test/data/extensions/api_test/file_browser/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698