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

Side by Side Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc

Issue 493633003: Browser changes for wiring up RequestContentScript API to shared memory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit: Inline methods in unit tests Created 6 years, 3 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
OLDNEW
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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 permission_check = WebRequestPermissions::REQUIRE_HOST_PERMISSION; 505 permission_check = WebRequestPermissions::REQUIRE_HOST_PERMISSION;
506 break; 506 break;
507 } 507 }
508 return WebRequestPermissions::CanExtensionAccessURL( 508 return WebRequestPermissions::CanExtensionAccessURL(
509 extension_info_map, extension_id, request->url(), crosses_incognito, 509 extension_info_map, extension_id, request->url(), crosses_incognito,
510 permission_check); 510 permission_check);
511 } 511 }
512 512
513 // static 513 // static
514 scoped_refptr<const WebRequestAction> WebRequestAction::Create( 514 scoped_refptr<const WebRequestAction> WebRequestAction::Create(
515 content::BrowserContext* browser_context,
515 const Extension* extension, 516 const Extension* extension,
516 const base::Value& json_action, 517 const base::Value& json_action,
517 std::string* error, 518 std::string* error,
518 bool* bad_message) { 519 bool* bad_message) {
519 *error = ""; 520 *error = "";
520 *bad_message = false; 521 *bad_message = false;
521 522
522 const base::DictionaryValue* action_dict = NULL; 523 const base::DictionaryValue* action_dict = NULL;
523 INPUT_FORMAT_VALIDATE(json_action.GetAsDictionary(&action_dict)); 524 INPUT_FORMAT_VALIDATE(json_action.GetAsDictionary(&action_dict));
524 525
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 const base::Time& extension_install_time) const { 1159 const base::Time& extension_install_time) const {
1159 CHECK(request_data.stage & stages()); 1160 CHECK(request_data.stage & stages());
1160 LinkedPtrEventResponseDelta result( 1161 LinkedPtrEventResponseDelta result(
1161 new extension_web_request_api_helpers::EventResponseDelta( 1162 new extension_web_request_api_helpers::EventResponseDelta(
1162 extension_id, extension_install_time)); 1163 extension_id, extension_install_time));
1163 result->messages_to_extension.insert(message_); 1164 result->messages_to_extension.insert(message_);
1164 return result; 1165 return result;
1165 } 1166 }
1166 1167
1167 } // namespace extensions 1168 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698