Chromium Code Reviews Chromium Code Reviews
Issue 652793002:
Add service registration for apps APIs implemented as mojo services. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 "extensions/browser/extension_web_contents_observer.h" | 5 #include "extensions/browser/extension_web_contents_observer.h" |
| 6 | 6 |
| 7 #include "content/public/browser/child_process_security_policy.h" | 7 #include "content/public/browser/child_process_security_policy.h" |
| 8 #include "content/public/browser/render_process_host.h" | 8 #include "content/public/browser/render_process_host.h" |
| 9 #include "content/public/browser/render_view_host.h" | 9 #include "content/public/browser/render_view_host.h" |
| 10 #include "content/public/browser/site_instance.h" | 10 #include "content/public/browser/site_instance.h" |
| 11 #include "content/public/browser/web_contents.h" | 11 #include "content/public/browser/web_contents.h" |
| 12 #include "content/public/common/url_constants.h" | 12 #include "content/public/common/url_constants.h" |
| 13 #include "extensions/browser/extension_prefs.h" | 13 #include "extensions/browser/extension_prefs.h" |
| 14 #include "extensions/browser/extension_registry.h" | 14 #include "extensions/browser/extension_registry.h" |
| 15 #include "extensions/browser/service_registration_manager.h" | |
| 15 #include "extensions/browser/view_type_utils.h" | 16 #include "extensions/browser/view_type_utils.h" |
| 16 #include "extensions/common/constants.h" | 17 #include "extensions/common/constants.h" |
| 17 #include "extensions/common/extension_messages.h" | 18 #include "extensions/common/extension_messages.h" |
| 18 | 19 |
| 19 namespace extensions { | 20 namespace extensions { |
| 20 | 21 |
| 21 ExtensionWebContentsObserver::ExtensionWebContentsObserver( | 22 ExtensionWebContentsObserver::ExtensionWebContentsObserver( |
| 22 content::WebContents* web_contents) | 23 content::WebContents* web_contents) |
| 23 : content::WebContentsObserver(web_contents), | 24 : content::WebContentsObserver(web_contents), |
| 24 browser_context_(web_contents->GetBrowserContext()) { | 25 browser_context_(web_contents->GetBrowserContext()) { |
| 25 NotifyRenderViewType(web_contents->GetRenderViewHost()); | 26 NotifyRenderViewType(web_contents->GetRenderViewHost()); |
| 26 } | 27 } |
| 27 | 28 |
| 28 ExtensionWebContentsObserver::~ExtensionWebContentsObserver() {} | 29 ExtensionWebContentsObserver::~ExtensionWebContentsObserver() {} |
| 29 | 30 |
| 31 void ExtensionWebContentsObserver::RenderFrameCreated( | |
| 32 content::RenderFrameHost* render_frame_host) { | |
| 33 if (known_render_frame_hosts_.count(render_frame_host)) | |
|
raymes
2014/10/15 20:22:49
It seems like a bug that this might be called twic
Ken Rockot(use gerrit already)
2014/10/15 21:45:27
Are we sure this really happens? It seems impossib
Sam McNally
2014/10/15 22:52:56
I put in a check and logging of stack traces and R
raymes
2014/10/20 02:12:55
Given that it's not urgent to land this CL I think
Sam McNally
2014/10/22 02:04:29
Filed https://code.google.com/p/chromium/issues/de
| |
| 34 return; | |
| 35 known_render_frame_hosts_.insert(render_frame_host); | |
| 36 ServiceRegistrationManager::GetSharedInstance()->AddToRenderFrame( | |
| 37 render_frame_host); | |
| 38 } | |
| 39 | |
| 40 void ExtensionWebContentsObserver::RenderFrameDeleted( | |
| 41 content::RenderFrameHost* render_frame_host) { | |
| 42 known_render_frame_hosts_.erase(render_frame_host); | |
| 43 } | |
| 44 | |
| 30 void ExtensionWebContentsObserver::RenderViewCreated( | 45 void ExtensionWebContentsObserver::RenderViewCreated( |
| 31 content::RenderViewHost* render_view_host) { | 46 content::RenderViewHost* render_view_host) { |
| 32 NotifyRenderViewType(render_view_host); | 47 NotifyRenderViewType(render_view_host); |
| 33 | 48 |
| 34 const Extension* extension = GetExtension(render_view_host); | 49 const Extension* extension = GetExtension(render_view_host); |
| 35 if (!extension) | 50 if (!extension) |
| 36 return; | 51 return; |
| 37 | 52 |
| 38 content::RenderProcessHost* process = render_view_host->GetProcess(); | 53 content::RenderProcessHost* process = render_view_host->GetProcess(); |
| 39 | 54 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 114 // site, so we can ignore that wrinkle here. | 129 // site, so we can ignore that wrinkle here. |
| 115 const GURL& site = render_view_host->GetSiteInstance()->GetSiteURL(); | 130 const GURL& site = render_view_host->GetSiteInstance()->GetSiteURL(); |
| 116 | 131 |
| 117 if (!site.SchemeIs(kExtensionScheme)) | 132 if (!site.SchemeIs(kExtensionScheme)) |
| 118 return std::string(); | 133 return std::string(); |
| 119 | 134 |
| 120 return site.host(); | 135 return site.host(); |
| 121 } | 136 } |
| 122 | 137 |
| 123 } // namespace extensions | 138 } // namespace extensions |
| OLD | NEW |
