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

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

Issue 192883004: linux_aura: run IconLoader::ReadIcon on the UI thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 179 }
180 180
181 } // namespace 181 } // namespace
182 182
183 // static 183 // static
184 IconGroupID IconLoader::ReadGroupIDFromFilepath( 184 IconGroupID IconLoader::ReadGroupIDFromFilepath(
185 const base::FilePath& filepath) { 185 const base::FilePath& filepath) {
186 return StringToLowerASCII(filepath.Extension()); 186 return StringToLowerASCII(filepath.Extension());
187 } 187 }
188 188
189 // static
189 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) { 190 bool IconLoader::IsIconMutableFromFilepath(const base::FilePath&) {
190 return false; 191 return false;
191 } 192 }
192 193
194 // static
195 content::BrowserThread::ID IconLoader::ReadIconThreadID() {
196 return content::BrowserThread::FILE;
197 }
198
193 void IconLoader::ReadIcon() { 199 void IconLoader::ReadIcon() {
194 static base::LazyInstance<IconMapper>::Leaky icon_mapper = 200 static base::LazyInstance<IconMapper>::Leaky icon_mapper =
195 LAZY_INSTANCE_INITIALIZER; 201 LAZY_INSTANCE_INITIALIZER;
196 int idr = icon_mapper.Get().Lookup(group_, icon_size_); 202 int idr = icon_mapper.Get().Lookup(group_, icon_size_);
197 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 203 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
198 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(), 204 gfx::ImageSkia image_skia(ResizeImage(*(rb.GetImageNamed(idr)).ToImageSkia(),
199 IconSizeToDIPSize(icon_size_))); 205 IconSizeToDIPSize(icon_size_)));
200 image_skia.MakeThreadSafe(); 206 image_skia.MakeThreadSafe();
201 image_.reset(new gfx::Image(image_skia)); 207 image_.reset(new gfx::Image(image_skia));
202 target_message_loop_->PostTask( 208 target_message_loop_->PostTask(
203 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this)); 209 FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
204 } 210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698