chrome/browser/extensions/extension_function_dispatcher.cc - Issue 6480033: Implement experimental.contentSettings.misc.blockThirdPartyCookies.

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

Issue 6480033: Implement experimental.contentSettings.misc.blockThirdPartyCookies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix stuff Created 9 years, 10 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

« no previous file with comments | « chrome/browser/extensions/extension_content_settings_apitest.cc ('k') | chrome/browser/extensions/extension_preference_api.h » ('j') | chrome/browser/extensions/extension_preference_api.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_function_dispatcher.cc

diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc

index 839b34189c4c811dc0da7b1fdffda75f97c36d39..a5f0e2df26f1521b1a430dc7848e6ff7b6e9630a 100644

--- a/chrome/browser/extensions/extension_function_dispatcher.cc

+++ b/chrome/browser/extensions/extension_function_dispatcher.cc

@@ -7,27 +7,27 @@

#include <map>

#include "base/process_util.h"

-#include "base/singleton.h"

#include "base/ref_counted.h"

+#include "base/singleton.h"

#include "base/values.h"

#include "build/build_config.h"

#include "chrome/browser/browser_list.h"

#include "chrome/browser/browser_window.h"

#include "chrome/browser/dom_ui/chrome_url_data_manager.h"

#include "chrome/browser/dom_ui/web_ui_favicon_source.h"

-#include "chrome/browser/external_protocol_handler.h"

#include "chrome/browser/extensions/execute_code_in_tab_function.h"

+#include "chrome/browser/extensions/extensions_quota_service.h"

battre 2011/02/11 13:49:02 Lint disagrees with your include order.

Bernhard Bauer 2011/02/11 15:27:15 Then I guess lint has a different notion of lexico

Bernhard Bauer 2011/02/11 15:35:13 It seems my sort was messed up. Done.

#include "chrome/browser/extensions/extension_accessibility_api.h"

-#include "chrome/browser/extensions/extension_bookmark_manager_api.h"

#include "chrome/browser/extensions/extension_bookmarks_module.h"

+#include "chrome/browser/extensions/extension_bookmark_manager_api.h"

#include "chrome/browser/extensions/extension_browser_actions_api.h"

#include "chrome/browser/extensions/extension_clipboard_api.h"

#include "chrome/browser/extensions/extension_context_menu_api.h"

#include "chrome/browser/extensions/extension_cookies_api.h"

#include "chrome/browser/extensions/extension_function.h"

#include "chrome/browser/extensions/extension_history_api.h"

-#include "chrome/browser/extensions/extension_idle_api.h"

#include "chrome/browser/extensions/extension_i18n_api.h"

+#include "chrome/browser/extensions/extension_idle_api.h"

#include "chrome/browser/extensions/extension_infobar_module.h"

#include "chrome/browser/extensions/extension_management_api.h"

#include "chrome/browser/extensions/extension_message_service.h"

@@ -36,18 +36,19 @@

#include "chrome/browser/extensions/extension_omnibox_api.h"

#include "chrome/browser/extensions/extension_page_actions_module.h"

#include "chrome/browser/extensions/extension_popup_api.h"

-#include "chrome/browser/extensions/extension_process_manager.h"

+#include "chrome/browser/extensions/extension_preference_api.h"

#include "chrome/browser/extensions/extension_processes_api.h"

+#include "chrome/browser/extensions/extension_process_manager.h"

#include "chrome/browser/extensions/extension_proxy_api.h"

#include "chrome/browser/extensions/extension_rlz_module.h"

+#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_sidebar_api.h"

#include "chrome/browser/extensions/extension_tabs_module.h"

#include "chrome/browser/extensions/extension_test_api.h"

#include "chrome/browser/extensions/extension_tts_api.h"

#include "chrome/browser/extensions/extension_web_ui.h"

#include "chrome/browser/extensions/extension_webstore_private_api.h"

-#include "chrome/browser/extensions/extensions_quota_service.h"

-#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/external_protocol_handler.h"

#include "chrome/browser/metrics/user_metrics.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/renderer_host/render_process_host.h"

@@ -297,6 +298,10 @@ void FactoryRegistry::ResetFunctions() {

RegisterFunction<PromptBrowserLoginFunction>();

RegisterFunction<BeginInstallFunction>();

RegisterFunction<CompleteInstallFunction>();

+ // Preferences.

+ RegisterFunction<GetPreferenceFunction>();

+ RegisterFunction<SetPreferenceFunction>();

}

void FactoryRegistry::GetAllNames(std::vector<std::string>* names) {