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

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

Issue 11827026: Overhaul JSON Schema Compiler to support a number of features required to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yoz Created 7 years, 11 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 | Annotate | Revision Log
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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 std::string* error, 456 std::string* error,
457 bool* bad_message) { 457 bool* bad_message) {
458 *error = ""; 458 *error = "";
459 *bad_message = false; 459 *bad_message = false;
460 Actions result; 460 Actions result;
461 461
462 for (AnyVector::const_iterator i = actions.begin(); 462 for (AnyVector::const_iterator i = actions.begin();
463 i != actions.end(); ++i) { 463 i != actions.end(); ++i) {
464 CHECK(i->get()); 464 CHECK(i->get());
465 scoped_ptr<WebRequestAction> action = 465 scoped_ptr<WebRequestAction> action =
466 WebRequestAction::Create((*i)->value(), error, bad_message); 466 WebRequestAction::Create(**i, error, bad_message);
467 if (!error->empty() || *bad_message) 467 if (!error->empty() || *bad_message)
468 return scoped_ptr<WebRequestActionSet>(NULL); 468 return scoped_ptr<WebRequestActionSet>(NULL);
469 result.push_back(make_linked_ptr(action.release())); 469 result.push_back(make_linked_ptr(action.release()));
470 } 470 }
471 471
472 return scoped_ptr<WebRequestActionSet>(new WebRequestActionSet(result)); 472 return scoped_ptr<WebRequestActionSet>(new WebRequestActionSet(result));
473 } 473 }
474 474
475 std::list<LinkedPtrEventResponseDelta> WebRequestActionSet::CreateDeltas( 475 std::list<LinkedPtrEventResponseDelta> WebRequestActionSet::CreateDeltas(
476 const ExtensionInfoMap* extension_info_map, 476 const ExtensionInfoMap* extension_info_map,
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 const base::Time& extension_install_time) const { 1035 const base::Time& extension_install_time) const {
1036 CHECK(request_data.stage & GetStages()); 1036 CHECK(request_data.stage & GetStages());
1037 LinkedPtrEventResponseDelta result( 1037 LinkedPtrEventResponseDelta result(
1038 new extension_web_request_api_helpers::EventResponseDelta( 1038 new extension_web_request_api_helpers::EventResponseDelta(
1039 extension_id, extension_install_time)); 1039 extension_id, extension_install_time));
1040 result->messages_to_extension.insert(message_); 1040 result->messages_to_extension.insert(message_);
1041 return result; 1041 return result;
1042 } 1042 }
1043 1043
1044 } // namespace extensions 1044 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698