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

Unified Diff: extensions/common/url_pattern_set.cc

Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: hate Created 8 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/url_pattern_set.h ('k') | extensions/common/url_pattern_set_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/url_pattern_set.cc
diff --git a/chrome/common/extensions/url_pattern_set.cc b/extensions/common/url_pattern_set.cc
similarity index 95%
rename from chrome/common/extensions/url_pattern_set.cc
rename to extensions/common/url_pattern_set.cc
index 691e75039bd3c231f4c0733a9663cb91469a3b3d..40663201c1c5a66169f5160a43eaa67f8f7d6f5f 100644
--- a/chrome/common/extensions/url_pattern_set.cc
+++ b/extensions/common/url_pattern_set.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/common/extensions/url_pattern_set.h"
+#include "extensions/common/url_pattern_set.h"
#include <algorithm>
#include <iterator>
@@ -10,11 +10,13 @@
#include "base/logging.h"
#include "base/memory/linked_ptr.h"
#include "base/values.h"
-#include "chrome/common/extensions/extension_error_utils.h"
#include "content/public/common/url_constants.h"
+#include "extensions/common/error_utils.h"
#include "extensions/common/url_pattern.h"
#include "googleurl/src/gurl.h"
+namespace extensions {
+
namespace {
const char kInvalidURLPatternError[] = "Invalid url pattern '*'";
@@ -184,8 +186,8 @@ bool URLPatternSet::Populate(const std::vector<std::string>& patterns,
URLPattern pattern(valid_schemes);
if (pattern.Parse(patterns[i]) != URLPattern::PARSE_SUCCESS) {
if (error) {
- *error = ExtensionErrorUtils::FormatErrorMessage(
- kInvalidURLPatternError, patterns[i]);
+ *error = ErrorUtils::FormatErrorMessage(kInvalidURLPatternError,
+ patterns[i]);
} else {
LOG(ERROR) << "Invalid url pattern: " << patterns[i];
}
@@ -213,3 +215,5 @@ bool URLPatternSet::Populate(const base::ListValue& value,
}
return Populate(patterns, valid_schemes, allow_file_access, error);
}
+
+} // namespace extensions
« no previous file with comments | « extensions/common/url_pattern_set.h ('k') | extensions/common/url_pattern_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698