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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 346493002: Android: Remove web_request extension API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/character_encoding.h" 25 #include "chrome/browser/character_encoding.h"
26 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 26 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
27 #include "chrome/browser/chrome_quota_permission_context.h" 27 #include "chrome/browser/chrome_quota_permission_context.h"
28 #include "chrome/browser/content_settings/content_settings_utils.h" 28 #include "chrome/browser/content_settings/content_settings_utils.h"
29 #include "chrome/browser/content_settings/cookie_settings.h" 29 #include "chrome/browser/content_settings/cookie_settings.h"
30 #include "chrome/browser/content_settings/host_content_settings_map.h" 30 #include "chrome/browser/content_settings/host_content_settings_map.h"
31 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 31 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
32 #include "chrome/browser/defaults.h" 32 #include "chrome/browser/defaults.h"
33 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" 33 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
34 #include "chrome/browser/download/download_prefs.h" 34 #include "chrome/browser/download/download_prefs.h"
35 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
36 #include "chrome/browser/extensions/browser_permissions_policy_delegate.h" 35 #include "chrome/browser/extensions/browser_permissions_policy_delegate.h"
37 #include "chrome/browser/extensions/extension_renderer_state.h" 36 #include "chrome/browser/extensions/extension_renderer_state.h"
38 #include "chrome/browser/extensions/extension_service.h" 37 #include "chrome/browser/extensions/extension_service.h"
39 #include "chrome/browser/extensions/extension_util.h" 38 #include "chrome/browser/extensions/extension_util.h"
40 #include "chrome/browser/extensions/extension_web_ui.h" 39 #include "chrome/browser/extensions/extension_web_ui.h"
41 #include "chrome/browser/extensions/extension_webkit_preferences.h" 40 #include "chrome/browser/extensions/extension_webkit_preferences.h"
42 #include "chrome/browser/extensions/suggest_permission_util.h" 41 #include "chrome/browser/extensions/suggest_permission_util.h"
43 #include "chrome/browser/geolocation/chrome_access_token_store.h" 42 #include "chrome/browser/geolocation/chrome_access_token_store.h"
44 #include "chrome/browser/geolocation/geolocation_permission_context.h" 43 #include "chrome/browser/geolocation/geolocation_permission_context.h"
45 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" 44 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 224
226 #if defined(USE_X11) 225 #if defined(USE_X11)
227 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" 226 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
228 #endif 227 #endif
229 228
230 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 229 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
231 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 230 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
232 #endif 231 #endif
233 232
234 #if defined(ENABLE_EXTENSIONS) 233 #if defined(ENABLE_EXTENSIONS)
234 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
235 #include "chrome/browser/guest_view/guest_view_base.h" 235 #include "chrome/browser/guest_view/guest_view_base.h"
236 #include "chrome/browser/guest_view/guest_view_constants.h" 236 #include "chrome/browser/guest_view/guest_view_constants.h"
237 #include "chrome/browser/guest_view/guest_view_manager.h" 237 #include "chrome/browser/guest_view/guest_view_manager.h"
238 #include "chrome/browser/guest_view/web_view/web_view_guest.h" 238 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
239 #include "chrome/browser/renderer_host/chrome_extension_message_filter.h" 239 #include "chrome/browser/renderer_host/chrome_extension_message_filter.h"
240 #endif 240 #endif
241 241
242 #if defined(ENABLE_SPELLCHECK) 242 #if defined(ENABLE_SPELLCHECK)
243 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 243 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
244 #endif 244 #endif
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 #endif 956 #endif
957 #if defined(OS_ANDROID) 957 #if defined(OS_ANDROID)
958 host->AddFilter(new cdm::CdmMessageFilterAndroid()); 958 host->AddFilter(new cdm::CdmMessageFilterAndroid());
959 #endif 959 #endif
960 if (switches::IsNewProfileManagement()) 960 if (switches::IsNewProfileManagement())
961 host->AddFilter(new PrincipalsMessageFilter(id)); 961 host->AddFilter(new PrincipalsMessageFilter(id));
962 962
963 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 963 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
964 profile->IsOffTheRecord())); 964 profile->IsOffTheRecord()));
965 965
966 #if defined(ENABLE_EXTENSIONS)
966 SendExtensionWebRequestStatusToHost(host); 967 SendExtensionWebRequestStatusToHost(host);
968 #endif
967 969
968 RendererContentSettingRules rules; 970 RendererContentSettingRules rules;
969 if (host->IsIsolatedGuest()) { 971 if (host->IsIsolatedGuest()) {
970 #if defined(ENABLE_EXTENSIONS) 972 #if defined(ENABLE_EXTENSIONS)
971 GuestViewBase::GetDefaultContentSettingRules(&rules, 973 GuestViewBase::GetDefaultContentSettingRules(&rules,
972 profile->IsOffTheRecord()); 974 profile->IsOffTheRecord());
973 #else 975 #else
974 NOTREACHED(); 976 NOTREACHED();
975 #endif 977 #endif
976 } else { 978 } else {
(...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after
2848 switches::kDisableWebRtcEncryption, 2850 switches::kDisableWebRtcEncryption,
2849 }; 2851 };
2850 to_command_line->CopySwitchesFrom(from_command_line, 2852 to_command_line->CopySwitchesFrom(from_command_line,
2851 kWebRtcDevSwitchNames, 2853 kWebRtcDevSwitchNames,
2852 arraysize(kWebRtcDevSwitchNames)); 2854 arraysize(kWebRtcDevSwitchNames));
2853 } 2855 }
2854 } 2856 }
2855 #endif // defined(ENABLE_WEBRTC) 2857 #endif // defined(ENABLE_WEBRTC)
2856 2858
2857 } // namespace chrome 2859 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698