Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/extensions/chrome_content_browser_client_extensions_par t.h" | 5 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_par t.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 33 #include "content/public/browser/web_contents.h" | 33 #include "content/public/browser/web_contents.h" |
| 34 #include "content/public/common/content_switches.h" | 34 #include "content/public/common/content_switches.h" |
| 35 #include "extensions/browser/api/web_request/web_request_api.h" | 35 #include "extensions/browser/api/web_request/web_request_api.h" |
| 36 #include "extensions/browser/api/web_request/web_request_api_helpers.h" | 36 #include "extensions/browser/api/web_request/web_request_api_helpers.h" |
| 37 #include "extensions/browser/bad_message.h" | 37 #include "extensions/browser/bad_message.h" |
| 38 #include "extensions/browser/extension_host.h" | 38 #include "extensions/browser/extension_host.h" |
| 39 #include "extensions/browser/extension_message_filter.h" | 39 #include "extensions/browser/extension_message_filter.h" |
| 40 #include "extensions/browser/extension_registry.h" | 40 #include "extensions/browser/extension_registry.h" |
| 41 #include "extensions/browser/extension_service_worker_message_filter.h" | 41 #include "extensions/browser/extension_service_worker_message_filter.h" |
| 42 #include "extensions/browser/extension_system.h" | 42 #include "extensions/browser/extension_system.h" |
| 43 #include "extensions/browser/extension_util.h" | |
| 43 #include "extensions/browser/guest_view/extensions_guest_view_message_filter.h" | 44 #include "extensions/browser/guest_view/extensions_guest_view_message_filter.h" |
| 44 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" | 45 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" |
| 45 #include "extensions/browser/info_map.h" | 46 #include "extensions/browser/info_map.h" |
| 46 #include "extensions/browser/io_thread_extension_message_filter.h" | 47 #include "extensions/browser/io_thread_extension_message_filter.h" |
| 47 #include "extensions/browser/view_type_utils.h" | 48 #include "extensions/browser/view_type_utils.h" |
| 48 #include "extensions/common/constants.h" | 49 #include "extensions/common/constants.h" |
| 50 #include "extensions/common/extension_messages.h" | |
| 49 #include "extensions/common/extensions_client.h" | 51 #include "extensions/common/extensions_client.h" |
| 50 #include "extensions/common/manifest_constants.h" | 52 #include "extensions/common/manifest_constants.h" |
| 51 #include "extensions/common/manifest_handlers/app_isolation_info.h" | 53 #include "extensions/common/manifest_handlers/app_isolation_info.h" |
| 52 #include "extensions/common/manifest_handlers/background_info.h" | 54 #include "extensions/common/manifest_handlers/background_info.h" |
| 53 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h" | 55 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h" |
| 54 #include "extensions/common/permissions/permissions_data.h" | 56 #include "extensions/common/permissions/permissions_data.h" |
| 55 #include "extensions/common/switches.h" | 57 #include "extensions/common/switches.h" |
| 56 | 58 |
| 57 #if defined(OS_CHROMEOS) | 59 #if defined(OS_CHROMEOS) |
| 58 #include "extensions/browser/api/vpn_provider/vpn_service.h" | 60 #include "extensions/browser/api/vpn_provider/vpn_service.h" |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 550 | 552 |
| 551 host->AddFilter(new ChromeExtensionMessageFilter(id, profile)); | 553 host->AddFilter(new ChromeExtensionMessageFilter(id, profile)); |
| 552 host->AddFilter(new ExtensionMessageFilter(id, profile)); | 554 host->AddFilter(new ExtensionMessageFilter(id, profile)); |
| 553 host->AddFilter(new IOThreadExtensionMessageFilter(id, profile)); | 555 host->AddFilter(new IOThreadExtensionMessageFilter(id, profile)); |
| 554 host->AddFilter(new ExtensionsGuestViewMessageFilter(id, profile)); | 556 host->AddFilter(new ExtensionsGuestViewMessageFilter(id, profile)); |
| 555 if (extensions::ExtensionsClient::Get() | 557 if (extensions::ExtensionsClient::Get() |
| 556 ->ExtensionAPIEnabledInExtensionServiceWorkers()) { | 558 ->ExtensionAPIEnabledInExtensionServiceWorkers()) { |
| 557 host->AddFilter(new ExtensionServiceWorkerMessageFilter(id, profile)); | 559 host->AddFilter(new ExtensionServiceWorkerMessageFilter(id, profile)); |
| 558 } | 560 } |
| 559 extension_web_request_api_helpers::SendExtensionWebRequestStatusToHost(host); | 561 extension_web_request_api_helpers::SendExtensionWebRequestStatusToHost(host); |
| 562 host->Send(new ExtensionMsg_SetUserSessionType( | |
| 563 extensions::util::GetCurrentSessionType())); | |
|
Devlin
2016/08/17 17:07:35
This should be done in RendererStartupHelper, not
tbarzic
2016/08/17 19:49:01
Done
| |
| 560 } | 564 } |
| 561 | 565 |
| 562 void ChromeContentBrowserClientExtensionsPart::SiteInstanceGotProcess( | 566 void ChromeContentBrowserClientExtensionsPart::SiteInstanceGotProcess( |
| 563 SiteInstance* site_instance) { | 567 SiteInstance* site_instance) { |
| 564 BrowserContext* context = site_instance->GetProcess()->GetBrowserContext(); | 568 BrowserContext* context = site_instance->GetProcess()->GetBrowserContext(); |
| 565 ExtensionRegistry* registry = ExtensionRegistry::Get(context); | 569 ExtensionRegistry* registry = ExtensionRegistry::Get(context); |
| 566 if (!registry) | 570 if (!registry) |
| 567 return; | 571 return; |
| 568 | 572 |
| 569 const Extension* extension = | 573 const Extension* extension = |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 686 } | 690 } |
| 687 } | 691 } |
| 688 } | 692 } |
| 689 | 693 |
| 690 void ChromeContentBrowserClientExtensionsPart::ResourceDispatcherHostCreated() { | 694 void ChromeContentBrowserClientExtensionsPart::ResourceDispatcherHostCreated() { |
| 691 content::ResourceDispatcherHost::Get()->RegisterInterceptor( | 695 content::ResourceDispatcherHost::Get()->RegisterInterceptor( |
| 692 "Origin", kExtensionScheme, base::Bind(&OnHttpHeaderReceived)); | 696 "Origin", kExtensionScheme, base::Bind(&OnHttpHeaderReceived)); |
| 693 } | 697 } |
| 694 | 698 |
| 695 } // namespace extensions | 699 } // namespace extensions |
| OLD | NEW |