| OLD | NEW |
| 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 2273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2284 | 2284 |
| 2285 content::SpeechRecognitionManagerDelegate* | 2285 content::SpeechRecognitionManagerDelegate* |
| 2286 ChromeContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { | 2286 ChromeContentBrowserClient::CreateSpeechRecognitionManagerDelegate() { |
| 2287 return new speech::ChromeSpeechRecognitionManagerDelegate(); | 2287 return new speech::ChromeSpeechRecognitionManagerDelegate(); |
| 2288 } | 2288 } |
| 2289 | 2289 |
| 2290 net::NetLog* ChromeContentBrowserClient::GetNetLog() { | 2290 net::NetLog* ChromeContentBrowserClient::GetNetLog() { |
| 2291 return g_browser_process->net_log(); | 2291 return g_browser_process->net_log(); |
| 2292 } | 2292 } |
| 2293 | 2293 |
| 2294 bool ChromeContentBrowserClient::IsFastShutdownPossible() { | |
| 2295 return true; | |
| 2296 } | |
| 2297 | |
| 2298 void ChromeContentBrowserClient::OverrideWebkitPrefs( | 2294 void ChromeContentBrowserClient::OverrideWebkitPrefs( |
| 2299 RenderViewHost* rvh, WebPreferences* web_prefs) { | 2295 RenderViewHost* rvh, WebPreferences* web_prefs) { |
| 2300 Profile* profile = Profile::FromBrowserContext( | 2296 Profile* profile = Profile::FromBrowserContext( |
| 2301 rvh->GetProcess()->GetBrowserContext()); | 2297 rvh->GetProcess()->GetBrowserContext()); |
| 2302 PrefService* prefs = profile->GetPrefs(); | 2298 PrefService* prefs = profile->GetPrefs(); |
| 2303 | 2299 |
| 2304 // Fill per-script font preferences. These are not registered on Android | 2300 // Fill per-script font preferences. These are not registered on Android |
| 2305 // - http://crbug.com/308033. | 2301 // - http://crbug.com/308033. |
| 2306 #if !defined(OS_ANDROID) | 2302 #if !defined(OS_ANDROID) |
| 2307 FontFamilyCache::FillFontFamilyMap(profile, | 2303 FontFamilyCache::FillFontFamilyMap(profile, |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3057 if (channel <= kMaxDisableEncryptionChannel) { | 3053 if (channel <= kMaxDisableEncryptionChannel) { |
| 3058 static const char* const kWebRtcDevSwitchNames[] = { | 3054 static const char* const kWebRtcDevSwitchNames[] = { |
| 3059 switches::kDisableWebRtcEncryption, | 3055 switches::kDisableWebRtcEncryption, |
| 3060 }; | 3056 }; |
| 3061 to_command_line->CopySwitchesFrom(from_command_line, | 3057 to_command_line->CopySwitchesFrom(from_command_line, |
| 3062 kWebRtcDevSwitchNames, | 3058 kWebRtcDevSwitchNames, |
| 3063 arraysize(kWebRtcDevSwitchNames)); | 3059 arraysize(kWebRtcDevSwitchNames)); |
| 3064 } | 3060 } |
| 3065 } | 3061 } |
| 3066 #endif // defined(ENABLE_WEBRTC) | 3062 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |