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

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

Issue 546943002: Move webrequest_constants.* to extensions/browser/api/declarative_webrequest/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try using *correct* name in .gn file. 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_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/strings/stringprintf.h" 10 #include "base/strings/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"
15 #include "components/url_matcher/url_matcher_factory.h" 14 #include "components/url_matcher/url_matcher_factory.h"
15 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"
16 #include "net/url_request/url_request.h" 16 #include "net/url_request/url_request.h"
17 17
18 using url_matcher::URLMatcherConditionFactory; 18 using url_matcher::URLMatcherConditionFactory;
19 using url_matcher::URLMatcherConditionSet; 19 using url_matcher::URLMatcherConditionSet;
20 using url_matcher::URLMatcherFactory; 20 using url_matcher::URLMatcherFactory;
21 21
22 namespace keys = extensions::declarative_webrequest_constants; 22 namespace keys = extensions::declarative_webrequest_constants;
23 23
24 namespace { 24 namespace {
25 static URLMatcherConditionSet::ID g_next_id = 0; 25 static URLMatcherConditionSet::ID g_next_id = 0;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 if (!result->stages()) { 196 if (!result->stages()) {
197 *error = kConditionCannotBeFulfilled; 197 *error = kConditionCannotBeFulfilled;
198 return scoped_ptr<WebRequestCondition>(); 198 return scoped_ptr<WebRequestCondition>();
199 } 199 }
200 200
201 return result.Pass(); 201 return result.Pass();
202 } 202 }
203 203
204 } // namespace extensions 204 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698