| Index: chrome/renderer/extensions/resource_request_policy.cc
|
| diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc
|
| index d6ac03a3a77300c62ca62f5d61e12dfebc3eb7d5..f5f70d00592fd9073d609de94d9c2994b6938dc7 100644
|
| --- a/chrome/renderer/extensions/resource_request_policy.cc
|
| +++ b/chrome/renderer/extensions/resource_request_policy.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -8,6 +8,7 @@
|
| #include "base/logging.h"
|
| #include "base/stringprintf.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "chrome/common/extensions/api/icons/icons_handler.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_set.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -44,7 +45,8 @@ bool ResourceRequestPolicy::CanRequestResource(
|
| std::string resource_root_relative_path =
|
| resource_url.path().empty() ? "" : resource_url.path().substr(1);
|
| if (extension->is_hosted_app() &&
|
| - !extension->icons().ContainsPath(resource_root_relative_path)) {
|
| + !IconsInfo::GetIcons(extension)
|
| + .ContainsPath(resource_root_relative_path)) {
|
| LOG(ERROR) << "Denying load of " << resource_url.spec() << " from "
|
| << "hosted app.";
|
| return false;
|
|
|