| 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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 759 site_instance->GetSiteURL()); | 759 site_instance->GetSiteURL()); |
| 760 if (!extension) | 760 if (!extension) |
| 761 return; | 761 return; |
| 762 | 762 |
| 763 ProcessMap::Get(context)->Insert(extension->id(), | 763 ProcessMap::Get(context)->Insert(extension->id(), |
| 764 site_instance->GetProcess()->GetID(), | 764 site_instance->GetProcess()->GetID(), |
| 765 site_instance->GetId()); | 765 site_instance->GetId()); |
| 766 | 766 |
| 767 BrowserThread::PostTask( | 767 BrowserThread::PostTask( |
| 768 BrowserThread::IO, FROM_HERE, | 768 BrowserThread::IO, FROM_HERE, |
| 769 base::Bind(&InfoMap::RegisterExtensionProcess, | 769 base::BindOnce(&InfoMap::RegisterExtensionProcess, |
| 770 ExtensionSystem::Get(context)->info_map(), extension->id(), | 770 ExtensionSystem::Get(context)->info_map(), extension->id(), |
| 771 site_instance->GetProcess()->GetID(), site_instance->GetId())); | 771 site_instance->GetProcess()->GetID(), |
| 772 site_instance->GetId())); |
| 772 } | 773 } |
| 773 | 774 |
| 774 void ChromeContentBrowserClientExtensionsPart::SiteInstanceDeleting( | 775 void ChromeContentBrowserClientExtensionsPart::SiteInstanceDeleting( |
| 775 SiteInstance* site_instance) { | 776 SiteInstance* site_instance) { |
| 776 BrowserContext* context = site_instance->GetBrowserContext(); | 777 BrowserContext* context = site_instance->GetBrowserContext(); |
| 777 ExtensionRegistry* registry = ExtensionRegistry::Get(context); | 778 ExtensionRegistry* registry = ExtensionRegistry::Get(context); |
| 778 if (!registry) | 779 if (!registry) |
| 779 return; | 780 return; |
| 780 | 781 |
| 781 const Extension* extension = | 782 const Extension* extension = |
| 782 registry->enabled_extensions().GetExtensionOrAppByURL( | 783 registry->enabled_extensions().GetExtensionOrAppByURL( |
| 783 site_instance->GetSiteURL()); | 784 site_instance->GetSiteURL()); |
| 784 if (!extension) | 785 if (!extension) |
| 785 return; | 786 return; |
| 786 | 787 |
| 787 ProcessMap::Get(context)->Remove(extension->id(), | 788 ProcessMap::Get(context)->Remove(extension->id(), |
| 788 site_instance->GetProcess()->GetID(), | 789 site_instance->GetProcess()->GetID(), |
| 789 site_instance->GetId()); | 790 site_instance->GetId()); |
| 790 | 791 |
| 791 BrowserThread::PostTask( | 792 BrowserThread::PostTask( |
| 792 BrowserThread::IO, FROM_HERE, | 793 BrowserThread::IO, FROM_HERE, |
| 793 base::Bind(&InfoMap::UnregisterExtensionProcess, | 794 base::BindOnce(&InfoMap::UnregisterExtensionProcess, |
| 794 ExtensionSystem::Get(context)->info_map(), extension->id(), | 795 ExtensionSystem::Get(context)->info_map(), extension->id(), |
| 795 site_instance->GetProcess()->GetID(), site_instance->GetId())); | 796 site_instance->GetProcess()->GetID(), |
| 797 site_instance->GetId())); |
| 796 } | 798 } |
| 797 | 799 |
| 798 void ChromeContentBrowserClientExtensionsPart::OverrideWebkitPrefs( | 800 void ChromeContentBrowserClientExtensionsPart::OverrideWebkitPrefs( |
| 799 RenderViewHost* rvh, | 801 RenderViewHost* rvh, |
| 800 WebPreferences* web_prefs) { | 802 WebPreferences* web_prefs) { |
| 801 const ExtensionRegistry* registry = | 803 const ExtensionRegistry* registry = |
| 802 ExtensionRegistry::Get(rvh->GetProcess()->GetBrowserContext()); | 804 ExtensionRegistry::Get(rvh->GetProcess()->GetBrowserContext()); |
| 803 if (!registry) | 805 if (!registry) |
| 804 return; | 806 return; |
| 805 | 807 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 869 command_line->AppendSwitch(switches::kExtensionProcess); | 871 command_line->AppendSwitch(switches::kExtensionProcess); |
| 870 } | 872 } |
| 871 } | 873 } |
| 872 | 874 |
| 873 void ChromeContentBrowserClientExtensionsPart::ResourceDispatcherHostCreated() { | 875 void ChromeContentBrowserClientExtensionsPart::ResourceDispatcherHostCreated() { |
| 874 content::ResourceDispatcherHost::Get()->RegisterInterceptor( | 876 content::ResourceDispatcherHost::Get()->RegisterInterceptor( |
| 875 "Origin", kExtensionScheme, base::Bind(&OnHttpHeaderReceived)); | 877 "Origin", kExtensionScheme, base::Bind(&OnHttpHeaderReceived)); |
| 876 } | 878 } |
| 877 | 879 |
| 878 } // namespace extensions | 880 } // namespace extensions |
| OLD | NEW |