OLD | NEW |
---|---|
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/ui/webui/extensions/extension_icon_source.h" | 5 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/memory/ref_counted_memory.h" | 9 #include "base/memory/ref_counted_memory.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
266 | 266 |
267 std::string size_param = path_parts.at(1); | 267 std::string size_param = path_parts.at(1); |
268 std::string match_param = path_parts.at(2); | 268 std::string match_param = path_parts.at(2); |
269 match_param = match_param.substr(0, match_param.find('?')); | 269 match_param = match_param.substr(0, match_param.find('?')); |
270 | 270 |
271 int size; | 271 int size; |
272 if (!base::StringToInt(size_param, &size)) | 272 if (!base::StringToInt(size_param, &size)) |
273 return false; | 273 return false; |
274 if (size <= 0) | 274 if (size <= 0) |
275 return false; | 275 return false; |
276 if (size > extension_misc::EXTENSION_ICON_GIGANTOR) | |
277 size = extension_misc::EXTENSION_ICON_GIGANTOR; | |
Matt Perry
2012/12/14 19:33:44
Let's return false instead.
| |
276 | 278 |
277 ExtensionIconSet::MatchType match_type; | 279 ExtensionIconSet::MatchType match_type; |
278 int match_num; | 280 int match_num; |
279 if (!base::StringToInt(match_param, &match_num)) | 281 if (!base::StringToInt(match_param, &match_num)) |
280 return false; | 282 return false; |
281 match_type = static_cast<ExtensionIconSet::MatchType>(match_num); | 283 match_type = static_cast<ExtensionIconSet::MatchType>(match_num); |
282 if (!(match_type == ExtensionIconSet::MATCH_EXACTLY || | 284 if (!(match_type == ExtensionIconSet::MATCH_EXACTLY || |
283 match_type == ExtensionIconSet::MATCH_SMALLER || | 285 match_type == ExtensionIconSet::MATCH_SMALLER || |
284 match_type == ExtensionIconSet::MATCH_BIGGER)) | 286 match_type == ExtensionIconSet::MATCH_BIGGER)) |
285 match_type = ExtensionIconSet::MATCH_EXACTLY; | 287 match_type = ExtensionIconSet::MATCH_EXACTLY; |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
326 | 328 |
327 void ExtensionIconSource::ClearData(int request_id) { | 329 void ExtensionIconSource::ClearData(int request_id) { |
328 std::map<int, ExtensionIconRequest*>::iterator i = | 330 std::map<int, ExtensionIconRequest*>::iterator i = |
329 request_map_.find(request_id); | 331 request_map_.find(request_id); |
330 if (i == request_map_.end()) | 332 if (i == request_map_.end()) |
331 return; | 333 return; |
332 | 334 |
333 delete i->second; | 335 delete i->second; |
334 request_map_.erase(i); | 336 request_map_.erase(i); |
335 } | 337 } |
OLD | NEW |