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

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

Issue 12092096: Move c/c/extensions/matcher/ to top level extension dir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TOT Created 7 years, 10 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_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/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h" 12 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
13 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion_attribute.h" 13 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion_attribute.h"
14 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h" 14 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h"
15 #include "chrome/common/extensions/matcher/url_matcher.h" 15 #include "extensions/common/matcher/url_matcher_factory.h"
16 #include "chrome/common/extensions/matcher/url_matcher_factory.h"
17 #include "net/url_request/url_request.h" 16 #include "net/url_request/url_request.h"
18 17
19 namespace keys = extensions::declarative_webrequest_constants; 18 namespace keys = extensions::declarative_webrequest_constants;
20 19
21 namespace { 20 namespace {
22 static extensions::URLMatcherConditionSet::ID g_next_id = 0; 21 static extensions::URLMatcherConditionSet::ID g_next_id = 0;
23 22
24 // TODO(battre): improve error messaging to give more meaningful messages 23 // TODO(battre): improve error messaging to give more meaningful messages
25 // to the extension developer. 24 // to the extension developer.
26 // Error messages: 25 // Error messages:
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 195
197 if (!result->stages()) { 196 if (!result->stages()) {
198 *error = kConditionCannotBeFulfilled; 197 *error = kConditionCannotBeFulfilled;
199 return scoped_ptr<WebRequestCondition>(NULL); 198 return scoped_ptr<WebRequestCondition>(NULL);
200 } 199 }
201 200
202 return result.Pass(); 201 return result.Pass();
203 } 202 }
204 203
205 } // namespace extensions 204 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698