| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/extensions/error_console/error_console.h" | 10 #include "chrome/browser/extensions/error_console/error_console.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 const StackTrace& stack_trace, | 112 const StackTrace& stack_trace, |
| 113 int32_t severity_level) { | 113 int32_t severity_level) { |
| 114 if (!IsSourceFromAnExtension(source)) | 114 if (!IsSourceFromAnExtension(source)) |
| 115 return; | 115 return; |
| 116 | 116 |
| 117 std::string extension_id = GetExtensionIdFromFrame(render_frame_host); | 117 std::string extension_id = GetExtensionIdFromFrame(render_frame_host); |
| 118 if (extension_id.empty()) | 118 if (extension_id.empty()) |
| 119 extension_id = GURL(source).host(); | 119 extension_id = GURL(source).host(); |
| 120 | 120 |
| 121 ErrorConsole::Get(browser_context()) | 121 ErrorConsole::Get(browser_context()) |
| 122 ->ReportError(scoped_ptr<ExtensionError>(new RuntimeError( | 122 ->ReportError(std::unique_ptr<ExtensionError>(new RuntimeError( |
| 123 extension_id, browser_context()->IsOffTheRecord(), source, message, | 123 extension_id, browser_context()->IsOffTheRecord(), source, message, |
| 124 stack_trace, web_contents()->GetLastCommittedURL(), | 124 stack_trace, web_contents()->GetLastCommittedURL(), |
| 125 static_cast<logging::LogSeverity>(severity_level), | 125 static_cast<logging::LogSeverity>(severity_level), |
| 126 render_frame_host->GetRoutingID(), | 126 render_frame_host->GetRoutingID(), |
| 127 render_frame_host->GetProcess()->GetID()))); | 127 render_frame_host->GetProcess()->GetID()))); |
| 128 } | 128 } |
| 129 | 129 |
| 130 void ChromeExtensionWebContentsObserver::InitializeRenderFrame( | 130 void ChromeExtensionWebContentsObserver::InitializeRenderFrame( |
| 131 content::RenderFrameHost* render_frame_host) { | 131 content::RenderFrameHost* render_frame_host) { |
| 132 ExtensionWebContentsObserver::InitializeRenderFrame(render_frame_host); | 132 ExtensionWebContentsObserver::InitializeRenderFrame(render_frame_host); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 if (rappor::RapporService* rappor = g_browser_process->rappor_service()) { | 222 if (rappor::RapporService* rappor = g_browser_process->rappor_service()) { |
| 223 const std::string& extension_id = | 223 const std::string& extension_id = |
| 224 parent_is_extension ? parent_url.host() : frame_url.host(); | 224 parent_is_extension ? parent_url.host() : frame_url.host(); |
| 225 rappor->RecordSample("Extensions.AffectedByIsolateExtensions", | 225 rappor->RecordSample("Extensions.AffectedByIsolateExtensions", |
| 226 rappor::UMA_RAPPOR_TYPE, extension_id); | 226 rappor::UMA_RAPPOR_TYPE, extension_id); |
| 227 } | 227 } |
| 228 } | 228 } |
| 229 } | 229 } |
| 230 | 230 |
| 231 } // namespace extensions | 231 } // namespace extensions |
| OLD | NEW |