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

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

Issue 2006973002: Background tracing: Enable field-trial control on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 (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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2905 matching lines...) Expand 10 before | Expand all | Expand 10 after
2916 2916
2917 return throttles; 2917 return throttles;
2918 } 2918 }
2919 2919
2920 content::DevToolsManagerDelegate* 2920 content::DevToolsManagerDelegate*
2921 ChromeContentBrowserClient::GetDevToolsManagerDelegate() { 2921 ChromeContentBrowserClient::GetDevToolsManagerDelegate() {
2922 return new ChromeDevToolsManagerDelegate(); 2922 return new ChromeDevToolsManagerDelegate();
2923 } 2923 }
2924 2924
2925 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { 2925 content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() {
2926 #if !defined(OS_ANDROID)
2927 return new ChromeTracingDelegate(); 2926 return new ChromeTracingDelegate();
2928 #else
2929 return nullptr;
2930 #endif
2931 } 2927 }
2932 2928
2933 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( 2929 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
2934 content::BrowserContext* browser_context, 2930 content::BrowserContext* browser_context,
2935 const GURL& url) { 2931 const GURL& url) {
2936 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) 2932 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
2937 return ChromeContentBrowserClientPluginsPart:: 2933 return ChromeContentBrowserClientPluginsPart::
2938 IsPluginAllowedToCallRequestOSFileHandle(browser_context, url, 2934 IsPluginAllowedToCallRequestOSFileHandle(browser_context, url,
2939 allowed_file_handle_origins_); 2935 allowed_file_handle_origins_);
2940 #else 2936 #else
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
2988 if (channel <= kMaxDisableEncryptionChannel) { 2984 if (channel <= kMaxDisableEncryptionChannel) {
2989 static const char* const kWebRtcDevSwitchNames[] = { 2985 static const char* const kWebRtcDevSwitchNames[] = {
2990 switches::kDisableWebRtcEncryption, 2986 switches::kDisableWebRtcEncryption,
2991 }; 2987 };
2992 to_command_line->CopySwitchesFrom(from_command_line, 2988 to_command_line->CopySwitchesFrom(from_command_line,
2993 kWebRtcDevSwitchNames, 2989 kWebRtcDevSwitchNames,
2994 arraysize(kWebRtcDevSwitchNames)); 2990 arraysize(kWebRtcDevSwitchNames));
2995 } 2991 }
2996 } 2992 }
2997 #endif // defined(ENABLE_WEBRTC) 2993 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_field_trials_desktop.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698