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

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

Issue 13812014: Added check for icons that change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from review. 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
(...skipping 17 matching lines...) Expand all
28 BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE, 28 BrowserThread::PostTaskAndReply(BrowserThread::FILE, FROM_HERE,
29 base::Bind(&IconLoader::ReadGroup, this), 29 base::Bind(&IconLoader::ReadGroup, this),
30 base::Bind(&IconLoader::OnReadGroup, this)); 30 base::Bind(&IconLoader::OnReadGroup, this));
31 } 31 }
32 32
33 void IconLoader::ReadGroup() { 33 void IconLoader::ReadGroup() {
34 group_ = ReadGroupIDFromFilepath(file_path_); 34 group_ = ReadGroupIDFromFilepath(file_path_);
35 } 35 }
36 36
37 void IconLoader::OnReadGroup() { 37 void IconLoader::OnReadGroup() {
38 if (!delegate_->OnGroupLoaded(this, group_)) { 38 if (IsIconMutableFromFilepath(file_path_) ||
39 !delegate_->OnGroupLoaded(this, group_)) {
39 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 40 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
40 base::Bind(&IconLoader::ReadIcon, this)); 41 base::Bind(&IconLoader::ReadIcon, this));
41 } 42 }
42 } 43 }
43 44
44 void IconLoader::NotifyDelegate() { 45 void IconLoader::NotifyDelegate() {
45 // If the delegate takes ownership of the Image, release it from the scoped 46 // If the delegate takes ownership of the Image, release it from the scoped
46 // pointer. 47 // pointer.
47 if (delegate_->OnImageLoaded(this, image_.get(), group_)) 48 if (delegate_->OnImageLoaded(this, image_.get(), group_))
48 ignore_result(image_.release()); // Can't ignore return value. 49 ignore_result(image_.release()); // Can't ignore return value.
49 } 50 }
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