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

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

Issue 10257006: Move Declarative Web Request API out of experimental and make it a feature (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with ToT Created 8 years, 7 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_condit ion.h" 5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/extensions/api/declarative/url_matcher.h" 11 #include "chrome/browser/extensions/api/declarative/url_matcher.h"
12 #include "chrome/browser/extensions/api/declarative/url_matcher_factory.h" 12 #include "chrome/browser/extensions/api/declarative/url_matcher_factory.h"
13 #include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h" 13 #include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h"
14 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion_attribute.h" 14 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion_attribute.h"
15 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h" 15 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h"
16 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h" 16 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h"
17 #include "net/url_request/url_request.h" 17 #include "net/url_request/url_request.h"
18 18
19 namespace keys = extensions::declarative_webrequest_constants; 19 namespace keys = extensions::declarative_webrequest_constants;
20 20
21 namespace { 21 namespace {
22 static extensions::URLMatcherConditionSet::ID g_next_id = 0; 22 static extensions::URLMatcherConditionSet::ID g_next_id = 0;
23 23
24 // TODO(battre): improve error messaging to give more meaningful messages 24 // TODO(battre): improve error messaging to give more meaningful messages
25 // to the extension developer. 25 // to the extension developer.
26 // Error messages: 26 // Error messages:
27 const char kExpectedDictionary[] = "A condition has to be a dictionary."; 27 const char kExpectedDictionary[] = "A condition has to be a dictionary.";
28 const char kConditionWithoutInstanceType[] = "A condition had no instanceType"; 28 const char kConditionWithoutInstanceType[] = "A condition had no instanceType";
29 const char kExpectedOtherConditionType[] = "Expected a condition of type " 29 const char kExpectedOtherConditionType[] = "Expected a condition of type "
30 "experimental.webRequest.RequestMatcher"; 30 "declarativeWebRequest.RequestMatcher";
31 const char kUnknownConditionAttribute[] = "Unknown condition attribute '%s'"; 31 const char kUnknownConditionAttribute[] = "Unknown condition attribute '%s'";
32 const char kInvalidTypeOfParamter[] = "Attribute '%s' has an invalid type"; 32 const char kInvalidTypeOfParamter[] = "Attribute '%s' has an invalid type";
33 } // namespace 33 } // namespace
34 34
35 namespace extensions { 35 namespace extensions {
36 36
37 namespace keys = declarative_webrequest_constants; 37 namespace keys = declarative_webrequest_constants;
38 38
39 // 39 //
40 // WebRequestCondition 40 // WebRequestCondition
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 (*i)->value(), error); 191 (*i)->value(), error);
192 if (!error->empty()) 192 if (!error->empty())
193 return scoped_ptr<WebRequestConditionSet>(NULL); 193 return scoped_ptr<WebRequestConditionSet>(NULL);
194 result.push_back(make_linked_ptr(condition.release())); 194 result.push_back(make_linked_ptr(condition.release()));
195 } 195 }
196 196
197 return scoped_ptr<WebRequestConditionSet>(new WebRequestConditionSet(result)); 197 return scoped_ptr<WebRequestConditionSet>(new WebRequestConditionSet(result));
198 } 198 }
199 199
200 } // namespace extensions 200 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698