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

Unified Diff: chrome/browser/extensions/extension_function_registry.cc

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/extension_function_registry.cc
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
index c0f0d78f7f4b458a046f24bc6acd9b3330366a1d..5f879fc30ce09eaeb954e9081c5ab8b51bf504d8 100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/download/download_extension_api.h"
#include "chrome/browser/extensions/api/app/app_api.h"
#include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
+#include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
#include "chrome/browser/extensions/api/cookies/cookies_api.h"
#include "chrome/browser/extensions/api/context_menu/context_menu_api.h"
#include "chrome/browser/extensions/api/declarative/declarative_api.h"
@@ -26,7 +27,6 @@
#include "chrome/browser/extensions/api/web_request/web_request_api.h"
#include "chrome/browser/extensions/execute_code_in_tab_function.h"
#include "chrome/browser/extensions/extension_chrome_auth_private_api.h"
-#include "chrome/browser/extensions/extension_content_settings_api.h"
#include "chrome/browser/extensions/extension_debugger_api.h"
#include "chrome/browser/extensions/extension_font_settings_api.h"
#include "chrome/browser/extensions/extension_i18n_api.h"
@@ -423,10 +423,10 @@ void ExtensionFunctionRegistry::ResetFunctions() {
RegisterFunction<extensions::GetBytesInUseSettingsFunction>();
// Content settings.
- RegisterFunction<GetResourceIdentifiersFunction>();
- RegisterFunction<ClearContentSettingsFunction>();
- RegisterFunction<GetContentSettingFunction>();
- RegisterFunction<SetContentSettingFunction>();
+ RegisterFunction<extensions::GetResourceIdentifiersFunction>();
+ RegisterFunction<extensions::ClearContentSettingsFunction>();
+ RegisterFunction<extensions::GetContentSettingFunction>();
+ RegisterFunction<extensions::SetContentSettingFunction>();
// Font settings.
RegisterFunction<GetFontListFunction>();
« no previous file with comments | « chrome/browser/extensions/extension_content_settings_unittest.cc ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698