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 "extensions/browser/api/declarative_webrequest/webrequest_action.h" | 5 #include "extensions/browser/api/declarative_webrequest/webrequest_action.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
509 case STRATEGY_NONE: | 509 case STRATEGY_NONE: |
510 permission_check = WebRequestPermissions::DO_NOT_CHECK_HOST; | 510 permission_check = WebRequestPermissions::DO_NOT_CHECK_HOST; |
511 break; | 511 break; |
512 case STRATEGY_HOST: | 512 case STRATEGY_HOST: |
513 permission_check = WebRequestPermissions::REQUIRE_HOST_PERMISSION; | 513 permission_check = WebRequestPermissions::REQUIRE_HOST_PERMISSION; |
514 break; | 514 break; |
515 } | 515 } |
516 // TODO(devlin): Pass in the real tab id here. | 516 // TODO(devlin): Pass in the real tab id here. |
517 return WebRequestPermissions::CanExtensionAccessURL( | 517 return WebRequestPermissions::CanExtensionAccessURL( |
518 extension_info_map, extension_id, request->url(), -1, | 518 extension_info_map, extension_id, request->url(), -1, |
519 apply_info->crosses_incognito, | 519 apply_info->crosses_incognito, permission_check, |
520 permission_check) == PermissionsData::ACCESS_ALLOWED; | 520 request->initiator()) == PermissionsData::ACCESS_ALLOWED; |
521 } | 521 } |
522 | 522 |
523 // static | 523 // static |
524 scoped_refptr<const WebRequestAction> WebRequestAction::Create( | 524 scoped_refptr<const WebRequestAction> WebRequestAction::Create( |
525 content::BrowserContext* browser_context, | 525 content::BrowserContext* browser_context, |
526 const Extension* extension, | 526 const Extension* extension, |
527 const base::Value& json_action, | 527 const base::Value& json_action, |
528 std::string* error, | 528 std::string* error, |
529 bool* bad_message) { | 529 bool* bad_message) { |
530 *error = ""; | 530 *error = ""; |
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1162 const base::Time& extension_install_time) const { | 1162 const base::Time& extension_install_time) const { |
1163 CHECK(request_data.stage & stages()); | 1163 CHECK(request_data.stage & stages()); |
1164 LinkedPtrEventResponseDelta result( | 1164 LinkedPtrEventResponseDelta result( |
1165 new extension_web_request_api_helpers::EventResponseDelta( | 1165 new extension_web_request_api_helpers::EventResponseDelta( |
1166 extension_id, extension_install_time)); | 1166 extension_id, extension_install_time)); |
1167 result->messages_to_extension.insert(message_); | 1167 result->messages_to_extension.insert(message_); |
1168 return result; | 1168 return result; |
1169 } | 1169 } |
1170 | 1170 |
1171 } // namespace extensions | 1171 } // namespace extensions |
OLD | NEW |