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

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

Issue 12211049: Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix presubmit. Created 7 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
« no previous file with comments | « chrome/browser/icon_loader.h ('k') | chrome/browser/icon_loader_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 10
11 using content::BrowserThread; 11 using content::BrowserThread;
12 12
13 IconLoader::IconLoader(const IconGroupID& group, IconSize size, 13 IconLoader::IconLoader(const base::FilePath& file_path, IconSize size,
14 Delegate* delegate) 14 Delegate* delegate)
15 : target_message_loop_(NULL), 15 : target_message_loop_(NULL),
16 group_(group), 16 file_path_(file_path),
17 icon_size_(size), 17 icon_size_(size),
18 image_(NULL), 18 image_(NULL),
19 delegate_(delegate) { 19 delegate_(delegate) {
20 } 20 }
21 21
22 IconLoader::~IconLoader() { 22 IconLoader::~IconLoader() {
23 } 23 }
24 24
25 void IconLoader::Start() { 25 void IconLoader::Start() {
26 target_message_loop_ = base::MessageLoopProxy::current(); 26 target_message_loop_ = base::MessageLoopProxy::current();
27 27
28 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 28 BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
29 base::Bind(&IconLoader::ReadIcon, this)); 29 base::Bind(&IconLoader::ReadGroup, this),
30 base::Bind(&IconLoader::OnReadGroup, this));
31 }
32
33 void IconLoader::ReadGroup() {
34 group_ = ReadGroupIDFromFilepath(file_path_);
35 }
36
37 void IconLoader::OnReadGroup() {
38 if (!delegate_->OnGroupLoaded(this, group_)) {
39 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
40 base::Bind(&IconLoader::ReadIcon, this));
41 }
30 } 42 }
31 43
32 void IconLoader::NotifyDelegate() { 44 void IconLoader::NotifyDelegate() {
33 // If the delegate takes ownership of the Image, release it from the scoped 45 // If the delegate takes ownership of the Image, release it from the scoped
34 // pointer. 46 // pointer.
35 if (delegate_->OnImageLoaded(this, image_.get())) 47 if (delegate_->OnImageLoaded(this, image_.get(), group_))
36 ignore_result(image_.release()); // Can't ignore return value. 48 ignore_result(image_.release()); // Can't ignore return value.
37 } 49 }
OLDNEW
« no previous file with comments | « chrome/browser/icon_loader.h ('k') | chrome/browser/icon_loader_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698