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

Side by Side Diff: chrome/browser/extensions/chrome_extension_web_contents_observer.cc

Issue 1035263002: Add service registration for Mojo services defined under chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
OLDNEW
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_extension_web_contents_observer.h" 5 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
6 6
7 #include "chrome/browser/extensions/chrome_mojo_service_registry.h"
7 #include "chrome/browser/extensions/error_console/error_console.h" 8 #include "chrome/browser/extensions/error_console/error_console.h"
8 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/common/extensions/chrome_extension_messages.h" 10 #include "chrome/common/extensions/chrome_extension_messages.h"
10 #include "content/public/browser/browser_context.h" 11 #include "content/public/browser/browser_context.h"
11 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
12 #include "content/public/browser/render_view_host.h" 13 #include "content/public/browser/render_view_host.h"
13 #include "extensions/browser/extension_registry.h" 14 #include "extensions/browser/extension_registry.h"
14 #include "extensions/browser/extension_system.h" 15 #include "extensions/browser/extension_system.h"
15 #include "extensions/common/extension_messages.h" 16 #include "extensions/common/extension_messages.h"
16 #include "extensions/common/extension_urls.h" 17 #include "extensions/common/extension_urls.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Reload the extension if it has crashed. 85 // Reload the extension if it has crashed.
85 // TODO(yoz): This reload doesn't happen synchronously for unpacked 86 // TODO(yoz): This reload doesn't happen synchronously for unpacked
86 // extensions. It seems to be fast enough, but there is a race. 87 // extensions. It seems to be fast enough, but there is a race.
87 // We should delay loading until the extension has reloaded. 88 // We should delay loading until the extension has reloaded.
88 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) { 89 if (registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)) {
89 ExtensionSystem::Get(browser_context())-> 90 ExtensionSystem::Get(browser_context())->
90 extension_service()->ReloadExtension(extension_id); 91 extension_service()->ReloadExtension(extension_id);
91 } 92 }
92 } 93 }
93 94
95 void ChromeExtensionWebContentsObserver::RegisterMojoServices(
96 content::RenderFrameHost* render_frame_host,
mark a. foltz 2015/03/27 20:24:11 What is the relationship between |render_frame_hos
Kevin M 2015/03/27 22:42:37 render_frame_host is created as a result of |web_c
97 const Extension* extension) {
98 DCHECK(render_frame_host);
99 DCHECK(extension);
100
101 ExtensionWebContentsObserver::RegisterMojoServices(render_frame_host,
102 extension);
103
104 RegisterChromeServicesForFrame(render_frame_host, extension);
105 }
106
94 } // namespace extensions 107 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698