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_extension_web_contents_observer.h" | 5 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" |
6 | 6 |
7 #include "chrome/browser/extensions/error_console/error_console.h" | 7 #include "chrome/browser/extensions/error_console/error_console.h" |
8 #include "chrome/browser/extensions/error_console/error_console_factory.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" |
17 | 18 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 int32 severity_level) { | 54 int32 severity_level) { |
54 if (!IsSourceFromAnExtension(source)) | 55 if (!IsSourceFromAnExtension(source)) |
55 return; | 56 return; |
56 | 57 |
57 content::RenderViewHost* render_view_host = | 58 content::RenderViewHost* render_view_host = |
58 web_contents()->GetRenderViewHost(); | 59 web_contents()->GetRenderViewHost(); |
59 std::string extension_id = GetExtensionId(render_view_host); | 60 std::string extension_id = GetExtensionId(render_view_host); |
60 if (extension_id.empty()) | 61 if (extension_id.empty()) |
61 extension_id = GURL(source).host(); | 62 extension_id = GURL(source).host(); |
62 | 63 |
63 ExtensionSystem::Get(browser_context())->error_console()->ReportError( | 64 ErrorConsoleFactory::GetForBrowserContext(browser_context())->ReportError( |
Reilly Grant (use Gerrit)
2015/05/12 17:58:52
Use ErrorConsole::Get instead of including error_c
juncai
2015/05/12 19:01:01
Done.
| |
64 scoped_ptr<ExtensionError>( | 65 scoped_ptr<ExtensionError>( |
65 new RuntimeError(extension_id, | 66 new RuntimeError(extension_id, |
66 browser_context()->IsOffTheRecord(), | 67 browser_context()->IsOffTheRecord(), |
67 source, | 68 source, |
68 message, | 69 message, |
69 stack_trace, | 70 stack_trace, |
70 web_contents()->GetLastCommittedURL(), | 71 web_contents()->GetLastCommittedURL(), |
71 static_cast<logging::LogSeverity>(severity_level), | 72 static_cast<logging::LogSeverity>(severity_level), |
72 render_view_host->GetRoutingID(), | 73 render_view_host->GetRoutingID(), |
73 render_view_host->GetProcess()->GetID()))); | 74 render_view_host->GetProcess()->GetID()))); |
(...skipping 11 matching lines...) Expand all Loading... | |
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 |
94 } // namespace extensions | 95 } // namespace extensions |
OLD | NEW |