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

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 7484072: Migrate geolocation settings to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 4 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 "chrome/browser/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 } 536 }
537 return host_content_settings_map_.get(); 537 return host_content_settings_map_.get();
538 } 538 }
539 539
540 virtual HostZoomMap* GetHostZoomMap() { 540 virtual HostZoomMap* GetHostZoomMap() {
541 if (!host_zoom_map_) 541 if (!host_zoom_map_)
542 host_zoom_map_ = new HostZoomMap(); 542 host_zoom_map_ = new HostZoomMap();
543 return host_zoom_map_.get(); 543 return host_zoom_map_.get();
544 } 544 }
545 545
546 virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() {
547 return profile_->GetGeolocationContentSettingsMap();
548 }
549
550 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() { 546 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() {
551 return profile_->GetGeolocationPermissionContext(); 547 return profile_->GetGeolocationPermissionContext();
552 } 548 }
553 549
554 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() { 550 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() {
555 return profile_->GetUserStyleSheetWatcher(); 551 return profile_->GetUserStyleSheetWatcher();
556 } 552 }
557 553
558 virtual FindBarState* GetFindBarState() { 554 virtual FindBarState* GetFindBarState() {
559 if (!find_bar_state_.get()) 555 if (!find_bar_state_.get())
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 }; 863 };
868 #endif 864 #endif
869 865
870 Profile* Profile::CreateOffTheRecordProfile() { 866 Profile* Profile::CreateOffTheRecordProfile() {
871 #if defined(OS_CHROMEOS) 867 #if defined(OS_CHROMEOS)
872 if (Profile::IsGuestSession()) 868 if (Profile::IsGuestSession())
873 return new GuestSessionProfile(this); 869 return new GuestSessionProfile(this);
874 #endif 870 #endif
875 return new OffTheRecordProfileImpl(this); 871 return new OffTheRecordProfileImpl(this);
876 } 872 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698