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/extensions/api/declarative_webrequest/webrequest_action
.h" | 5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_action
.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 | 418 |
419 bool WebRequestAction::DeltaHasPermission( | 419 bool WebRequestAction::DeltaHasPermission( |
420 const ExtensionInfoMap* extension_info_map, | 420 const ExtensionInfoMap* extension_info_map, |
421 const std::string& extension_id, | 421 const std::string& extension_id, |
422 const net::URLRequest* request, | 422 const net::URLRequest* request, |
423 bool crosses_incognito, | 423 bool crosses_incognito, |
424 const LinkedPtrEventResponseDelta& delta) const { | 424 const LinkedPtrEventResponseDelta& delta) const { |
425 if (GetHostPermissionsStrategy() == STRATEGY_ALLOW_SAME_DOMAIN) { | 425 if (GetHostPermissionsStrategy() == STRATEGY_ALLOW_SAME_DOMAIN) { |
426 return | 426 return |
427 net::RegistryControlledDomainService::SameDomainOrHost( | 427 net::RegistryControlledDomainService::SameDomainOrHost( |
428 request->url(), delta->new_url) || | 428 request->url(), delta->new_url, |
| 429 net::RCDS::EXCLUDE_PRIVATE_REGISTRIES) || |
429 WebRequestPermissions::CanExtensionAccessURL( | 430 WebRequestPermissions::CanExtensionAccessURL( |
430 extension_info_map, extension_id, request->url(), crosses_incognito, | 431 extension_info_map, extension_id, request->url(), crosses_incognito, |
431 true); | 432 true); |
432 } | 433 } |
433 return true; | 434 return true; |
434 } | 435 } |
435 | 436 |
436 // static | 437 // static |
437 scoped_ptr<WebRequestAction> WebRequestAction::Create( | 438 scoped_ptr<WebRequestAction> WebRequestAction::Create( |
438 const base::Value& json_action, | 439 const base::Value& json_action, |
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1017 const base::Time& extension_install_time) const { | 1018 const base::Time& extension_install_time) const { |
1018 CHECK(request_data.stage & GetStages()); | 1019 CHECK(request_data.stage & GetStages()); |
1019 LinkedPtrEventResponseDelta result( | 1020 LinkedPtrEventResponseDelta result( |
1020 new extension_web_request_api_helpers::EventResponseDelta( | 1021 new extension_web_request_api_helpers::EventResponseDelta( |
1021 extension_id, extension_install_time)); | 1022 extension_id, extension_install_time)); |
1022 result->messages_to_extension.insert(message_); | 1023 result->messages_to_extension.insert(message_); |
1023 return result; | 1024 return result; |
1024 } | 1025 } |
1025 | 1026 |
1026 } // namespace extensions | 1027 } // namespace extensions |
OLD | NEW |