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

Side by Side Diff: content/shell/shell_browser_context.cc

Issue 7989001: Remove use of default request context and fix use of speech censor flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update SpeechInputPreferences when preference changes Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/shell/shell_browser_context.h" 5 #include "content/shell/shell_browser_context.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/string_split.h" 10 #include "base/string_split.h"
11 #include "content/browser/appcache/chrome_appcache_service.h" 11 #include "content/browser/appcache/chrome_appcache_service.h"
12 #include "content/browser/browser_thread.h" 12 #include "content/browser/browser_thread.h"
13 #include "content/browser/chrome_blob_storage_context.h" 13 #include "content/browser/chrome_blob_storage_context.h"
14 #include "content/browser/download/download_manager.h" 14 #include "content/browser/download/download_manager.h"
15 #include "content/browser/download/download_status_updater.h" 15 #include "content/browser/download/download_status_updater.h"
16 #include "content/browser/download/mock_download_manager_delegate.h" 16 #include "content/browser/download/mock_download_manager_delegate.h"
17 #include "content/browser/file_system/browser_file_system_helper.h" 17 #include "content/browser/file_system/browser_file_system_helper.h"
18 #include "content/browser/geolocation/geolocation_permission_context.h" 18 #include "content/browser/geolocation/geolocation_permission_context.h"
19 #include "content/browser/host_zoom_map.h" 19 #include "content/browser/host_zoom_map.h"
20 #include "content/browser/in_process_webkit/webkit_context.h" 20 #include "content/browser/in_process_webkit/webkit_context.h"
21 #include "content/browser/resource_context.h" 21 #include "content/browser/resource_context.h"
22 #include "content/browser/ssl/ssl_host_state.h" 22 #include "content/browser/ssl/ssl_host_state.h"
23 #include "content/browser/speech/speech_input_preferences.h"
23 #include "content/shell/shell_browser_main.h" 24 #include "content/shell/shell_browser_main.h"
24 #include "net/base/cert_verifier.h" 25 #include "net/base/cert_verifier.h"
25 #include "net/base/cookie_monster.h" 26 #include "net/base/cookie_monster.h"
26 #include "net/base/default_origin_bound_cert_store.h" 27 #include "net/base/default_origin_bound_cert_store.h"
27 #include "net/base/dnsrr_resolver.h" 28 #include "net/base/dnsrr_resolver.h"
28 #include "net/base/host_resolver.h" 29 #include "net/base/host_resolver.h"
29 #include "net/http/http_auth_handler_factory.h" 30 #include "net/http/http_auth_handler_factory.h"
30 #include "net/http/http_cache.h" 31 #include "net/http/http_cache.h"
31 #include "net/base/origin_bound_cert_service.h" 32 #include "net/base/origin_bound_cert_service.h"
32 #include "net/base/ssl_config_service_defaults.h" 33 #include "net/base/ssl_config_service_defaults.h"
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 311
311 GeolocationPermissionContext* 312 GeolocationPermissionContext*
312 ShellBrowserContext::GetGeolocationPermissionContext() { 313 ShellBrowserContext::GetGeolocationPermissionContext() {
313 if (!geolocation_permission_context_) { 314 if (!geolocation_permission_context_) {
314 geolocation_permission_context_ = 315 geolocation_permission_context_ =
315 new ShellGeolocationPermissionContext(); 316 new ShellGeolocationPermissionContext();
316 } 317 }
317 return geolocation_permission_context_; 318 return geolocation_permission_context_;
318 } 319 }
319 320
321 SpeechInputPreferences* ShellBrowserContext::GetSpeechInputPreferences() {
322 if (!speech_input_preferences_.get())
323 speech_input_preferences_ = new SpeechInputPreferences(true);
324 return speech_input_preferences_.get();
325 }
326
320 bool ShellBrowserContext::DidLastSessionExitCleanly() { 327 bool ShellBrowserContext::DidLastSessionExitCleanly() {
321 return true; 328 return true;
322 } 329 }
323 330
324 quota::QuotaManager* ShellBrowserContext::GetQuotaManager() { 331 quota::QuotaManager* ShellBrowserContext::GetQuotaManager() {
325 CreateQuotaManagerAndClients(); 332 CreateQuotaManagerAndClients();
326 return quota_manager_.get(); 333 return quota_manager_.get();
327 } 334 }
328 335
329 WebKitContext* ShellBrowserContext::GetWebKitContext() { 336 WebKitContext* ShellBrowserContext::GetWebKitContext() {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 NewRunnableMethod( 388 NewRunnableMethod(
382 appcache_service_.get(), 389 appcache_service_.get(),
383 &ChromeAppCacheService::InitializeOnIOThread, 390 &ChromeAppCacheService::InitializeOnIOThread,
384 IsOffTheRecord() 391 IsOffTheRecord()
385 ? FilePath() : GetPath().Append(FILE_PATH_LITERAL("AppCache")), 392 ? FilePath() : GetPath().Append(FILE_PATH_LITERAL("AppCache")),
386 &GetResourceContext(), 393 &GetResourceContext(),
387 special_storage_policy)); 394 special_storage_policy));
388 } 395 }
389 396
390 } // namespace content 397 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698