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

Side by Side Diff: extensions/common/url_pattern_set.cc

Issue 18919005: Migrate from googleurl/ includes to url/ ones in the remaining top-level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make googleurl a temp include rule - to prevent others including it again Created 7 years, 5 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
« no previous file with comments | « extensions/common/url_pattern.cc ('k') | extensions/common/url_pattern_set_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "extensions/common/url_pattern_set.h" 5 #include "extensions/common/url_pattern_set.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "content/public/common/url_constants.h" 13 #include "content/public/common/url_constants.h"
14 #include "extensions/common/error_utils.h" 14 #include "extensions/common/error_utils.h"
15 #include "extensions/common/url_pattern.h" 15 #include "extensions/common/url_pattern.h"
16 #include "googleurl/src/gurl.h" 16 #include "url/gurl.h"
17 17
18 namespace extensions { 18 namespace extensions {
19 19
20 namespace { 20 namespace {
21 21
22 const char kInvalidURLPatternError[] = "Invalid url pattern '*'"; 22 const char kInvalidURLPatternError[] = "Invalid url pattern '*'";
23 23
24 } // namespace 24 } // namespace
25 25
26 // static 26 // static
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 for (size_t i = 0; i < value.GetSize(); ++i) { 224 for (size_t i = 0; i < value.GetSize(); ++i) {
225 std::string item; 225 std::string item;
226 if (!value.GetString(i, &item)) 226 if (!value.GetString(i, &item))
227 return false; 227 return false;
228 patterns.push_back(item); 228 patterns.push_back(item);
229 } 229 }
230 return Populate(patterns, valid_schemes, allow_file_access, error); 230 return Populate(patterns, valid_schemes, allow_file_access, error);
231 } 231 }
232 232
233 } // namespace extensions 233 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/url_pattern.cc ('k') | extensions/common/url_pattern_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698