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

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_helpers.h

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.h
diff --git a/chrome/browser/extensions/extension_content_settings_helpers.h b/chrome/browser/extensions/api/content_settings/content_settings_helpers.h
similarity index 79%
rename from chrome/browser/extensions/extension_content_settings_helpers.h
rename to chrome/browser/extensions/api/content_settings/content_settings_helpers.h
index abad7106dd473c20cba89821a66d2a419f8801df..0cf620850573c87ab66442d83b5deae95b22ebab 100644
--- a/chrome/browser/extensions/extension_content_settings_helpers.h
+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_HELPERS_H__
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_HELPERS_H__
+#ifndef CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_HELPERS_H__
+#define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_HELPERS_H__
#pragma once
#include <string>
@@ -11,7 +11,8 @@
#include "chrome/common/content_settings.h"
#include "chrome/common/content_settings_pattern.h"
-namespace extension_content_settings_helpers {
+namespace extensions {
+namespace content_settings_helpers {
// Parses an extension match pattern and returns a corresponding
// content settings pattern object.
@@ -37,6 +38,7 @@ bool StringToContentSetting(const std::string& setting_str,
// Returns a string representation of a ContentSetting.
const char* ContentSettingToString(ContentSetting setting);
-} // namespace extension_content_settings_helpers
+} // namespace content_settings_helpers
+} // namespace extensions
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_HELPERS_H__
+#endif // CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_HELPERS_H__

Powered by Google App Engine
This is Rietveld 408576698