| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index d0e4937aa71d9413cb32cadcde046228602b7a59..d399abad9bb90d9faaadf8d8ea5872d00c3c7893 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -73,6 +73,7 @@
|
| #include "chrome/browser/ssl/ssl_error_handler.h"
|
| #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
|
| #include "chrome/browser/tab_contents/tab_util.h"
|
| +#include "chrome/browser/tracing/chrome_tracing_delegate.h"
|
| #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
|
| #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
|
| #include "chrome/browser/ui/chrome_select_file_policy.h"
|
| @@ -2555,6 +2556,14 @@ ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
|
| #endif
|
| }
|
|
|
| +content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
|
| +#if !defined(OS_ANDROID)
|
| + return new ChromeTracingDelegate();
|
| +#else
|
| + return nullptr;
|
| +#endif
|
| +}
|
| +
|
| bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
|
| content::BrowserContext* browser_context,
|
| const GURL& url) {
|
|
|