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

Side by Side Diff: chrome/test/base/testing_profile.cc

Issue 11183018: Refactor ChromeGeolocationPermissionContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updates from comments Created 8 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | 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/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 host_content_settings_map_->RegisterExtensionService(extension_service); 698 host_content_settings_map_->RegisterExtensionService(extension_service);
699 #endif 699 #endif
700 } 700 }
701 return host_content_settings_map_.get(); 701 return host_content_settings_map_.get();
702 } 702 }
703 703
704 content::GeolocationPermissionContext* 704 content::GeolocationPermissionContext*
705 TestingProfile::GetGeolocationPermissionContext() { 705 TestingProfile::GetGeolocationPermissionContext() {
706 if (!geolocation_permission_context_.get()) { 706 if (!geolocation_permission_context_.get()) {
707 geolocation_permission_context_ = 707 geolocation_permission_context_ =
708 new ChromeGeolocationPermissionContext(this); 708 ChromeGeolocationPermissionContext::Create(this);
709 } 709 }
710 return geolocation_permission_context_.get(); 710 return geolocation_permission_context_.get();
711 } 711 }
712 712
713 content::SpeechRecognitionPreferences* 713 content::SpeechRecognitionPreferences*
714 TestingProfile::GetSpeechRecognitionPreferences() { 714 TestingProfile::GetSpeechRecognitionPreferences() {
715 #if defined(ENABLE_INPUT_SPEECH) 715 #if defined(ENABLE_INPUT_SPEECH)
716 return ChromeSpeechRecognitionPreferences::GetForProfile(this); 716 return ChromeSpeechRecognitionPreferences::GetForProfile(this);
717 #else 717 #else
718 return NULL; 718 return NULL;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() { 836 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
837 DCHECK(!build_called_); 837 DCHECK(!build_called_);
838 build_called_ = true; 838 build_called_ = true;
839 return scoped_ptr<TestingProfile>(new TestingProfile( 839 return scoped_ptr<TestingProfile>(new TestingProfile(
840 path_, 840 path_,
841 delegate_, 841 delegate_,
842 extension_policy_, 842 extension_policy_,
843 pref_service_.Pass(), 843 pref_service_.Pass(),
844 user_cloud_policy_manager_.Pass())); 844 user_cloud_policy_manager_.Pass()));
845 } 845 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698