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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 911153002: Moved the TraceUploader to chrome/ and abstracted it for alternative new upload destinations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/tracing/OWNERS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "chrome/browser/signin/principals_message_filter.h" 66 #include "chrome/browser/signin/principals_message_filter.h"
67 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" 67 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
68 #include "chrome/browser/speech/tts_controller.h" 68 #include "chrome/browser/speech/tts_controller.h"
69 #include "chrome/browser/speech/tts_message_filter.h" 69 #include "chrome/browser/speech/tts_message_filter.h"
70 #include "chrome/browser/ssl/ssl_add_certificate.h" 70 #include "chrome/browser/ssl/ssl_add_certificate.h"
71 #include "chrome/browser/ssl/ssl_blocking_page.h" 71 #include "chrome/browser/ssl/ssl_blocking_page.h"
72 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" 72 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
73 #include "chrome/browser/ssl/ssl_error_handler.h" 73 #include "chrome/browser/ssl/ssl_error_handler.h"
74 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" 74 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
75 #include "chrome/browser/tab_contents/tab_util.h" 75 #include "chrome/browser/tab_contents/tab_util.h"
76 #include "chrome/browser/tracing/chrome_tracing_delegate.h"
76 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" 77 #include "chrome/browser/ui/blocked_content/blocked_window_params.h"
77 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" 78 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
78 #include "chrome/browser/ui/chrome_select_file_policy.h" 79 #include "chrome/browser/ui/chrome_select_file_policy.h"
79 #include "chrome/browser/ui/sync/sync_promo_ui.h" 80 #include "chrome/browser/ui/sync/sync_promo_ui.h"
80 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" 81 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
81 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 82 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
82 #include "chrome/common/chrome_constants.h" 83 #include "chrome/common/chrome_constants.h"
83 #include "chrome/common/chrome_paths.h" 84 #include "chrome/common/chrome_paths.h"
84 #include "chrome/common/chrome_switches.h" 85 #include "chrome/common/chrome_switches.h"
85 #include "chrome/common/env_vars.h" 86 #include "chrome/common/env_vars.h"
(...skipping 2462 matching lines...) Expand 10 before | Expand all | Expand 10 after
2548 2549
2549 content::DevToolsManagerDelegate* 2550 content::DevToolsManagerDelegate*
2550 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 2551 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
2551 #if defined(OS_ANDROID) 2552 #if defined(OS_ANDROID)
2552 return new DevToolsManagerDelegateAndroid(); 2553 return new DevToolsManagerDelegateAndroid();
2553 #else 2554 #else
2554 return new ChromeDevToolsManagerDelegate(); 2555 return new ChromeDevToolsManagerDelegate();
2555 #endif 2556 #endif
2556 } 2557 }
2557 2558
2559 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
2560 #if !defined(OS_ANDROID)
2561 return new ChromeTracingDelegate();
2562 #else
2563 return nullptr;
2564 #endif
2565 }
2566
2558 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 2567 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
2559 content::BrowserContext* browser_context, 2568 content::BrowserContext* browser_context,
2560 const GURL& url) { 2569 const GURL& url) {
2561 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) 2570 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
2562 return ChromeContentBrowserClientPluginsPart:: 2571 return ChromeContentBrowserClientPluginsPart::
2563 IsPluginAllowedToCallRequestOSFileHandle(browser_context, url, 2572 IsPluginAllowedToCallRequestOSFileHandle(browser_context, url,
2564 allowed_file_handle_origins_); 2573 allowed_file_handle_origins_);
2565 #else 2574 #else
2566 return false; 2575 return false;
2567 #endif 2576 #endif
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
2625 switches::kDisableWebRtcEncryption, 2634 switches::kDisableWebRtcEncryption,
2626 }; 2635 };
2627 to_command_line->CopySwitchesFrom(from_command_line, 2636 to_command_line->CopySwitchesFrom(from_command_line,
2628 kWebRtcDevSwitchNames, 2637 kWebRtcDevSwitchNames,
2629 arraysize(kWebRtcDevSwitchNames)); 2638 arraysize(kWebRtcDevSwitchNames));
2630 } 2639 }
2631 } 2640 }
2632 #endif // defined(ENABLE_WEBRTC) 2641 #endif // defined(ENABLE_WEBRTC)
2633 2642
2634 } // namespace chrome 2643 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/tracing/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698