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

Side by Side Diff: extensions/browser/content_verifier_io_data.cc

Issue 630243002: Fix extension content verification handling of ./ in icon paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added copyright headers to .js files to fix presubmit error Created 6 years, 2 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 | « extensions/browser/content_verifier_io_data.h ('k') | extensions/browser/content_verify_job.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/browser/content_verifier_io_data.h" 5 #include "extensions/browser/content_verifier_io_data.h"
6 6
7 #include "content/public/browser/browser_thread.h" 7 #include "content/public/browser/browser_thread.h"
8 8
9 namespace extensions { 9 namespace extensions {
10 10
11 ContentVerifierIOData::ExtensionData::ExtensionData( 11 ContentVerifierIOData::ExtensionData::ExtensionData(
12 const std::set<base::FilePath>& browser_image_paths, 12 scoped_ptr<std::set<base::FilePath>> browser_image_paths,
13 const base::Version& version) { 13 const base::Version& version) {
14 this->browser_image_paths = browser_image_paths; 14 this->browser_image_paths = browser_image_paths.Pass();
15 this->version = version; 15 this->version = version;
16 } 16 }
17 17
18 ContentVerifierIOData::ContentVerifierIOData() { 18 ContentVerifierIOData::ContentVerifierIOData() {
19 } 19 }
20 20
21 ContentVerifierIOData::ExtensionData::~ExtensionData() { 21 ContentVerifierIOData::ExtensionData::~ExtensionData() {
22 } 22 }
23 23
24 ContentVerifierIOData::~ContentVerifierIOData() { 24 ContentVerifierIOData::~ContentVerifierIOData() {
25 } 25 }
26 26
27 void ContentVerifierIOData::AddData(const std::string& extension_id, 27 void ContentVerifierIOData::AddData(const std::string& extension_id,
28 scoped_ptr<ExtensionData> data) { 28 scoped_ptr<ExtensionData> data) {
29 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 29 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
30 CHECK(data->browser_image_paths.get());
30 data_map_[extension_id] = linked_ptr<ExtensionData>(data.release()); 31 data_map_[extension_id] = linked_ptr<ExtensionData>(data.release());
31 } 32 }
32 33
33 void ContentVerifierIOData::RemoveData(const std::string& extension_id) { 34 void ContentVerifierIOData::RemoveData(const std::string& extension_id) {
34 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 35 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
35 std::map<std::string, linked_ptr<ExtensionData> >::iterator found = 36 std::map<std::string, linked_ptr<ExtensionData> >::iterator found =
36 data_map_.find(extension_id); 37 data_map_.find(extension_id);
37 if (found != data_map_.end()) 38 if (found != data_map_.end())
38 data_map_.erase(found); 39 data_map_.erase(found);
39 } 40 }
40 41
41 void ContentVerifierIOData::Clear() { 42 void ContentVerifierIOData::Clear() {
42 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 43 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
43 data_map_.clear(); 44 data_map_.clear();
44 } 45 }
45 46
46 const ContentVerifierIOData::ExtensionData* ContentVerifierIOData::GetData( 47 const ContentVerifierIOData::ExtensionData* ContentVerifierIOData::GetData(
47 const std::string& extension_id) { 48 const std::string& extension_id) {
48 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 49 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
49 std::map<std::string, linked_ptr<ExtensionData> >::iterator found = 50 std::map<std::string, linked_ptr<ExtensionData> >::iterator found =
50 data_map_.find(extension_id); 51 data_map_.find(extension_id);
51 if (found != data_map_.end()) 52 if (found != data_map_.end())
52 return found->second.get(); 53 return found->second.get();
53 else 54 else
54 return NULL; 55 return NULL;
55 } 56 }
56 57
57 } // namespace extensions 58 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/content_verifier_io_data.h ('k') | extensions/browser/content_verify_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698