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

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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | 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) 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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 } 543 }
544 return host_content_settings_map_.get(); 544 return host_content_settings_map_.get();
545 } 545 }
546 546
547 virtual HostZoomMap* GetHostZoomMap() { 547 virtual HostZoomMap* GetHostZoomMap() {
548 if (!host_zoom_map_) 548 if (!host_zoom_map_)
549 host_zoom_map_ = new HostZoomMap(); 549 host_zoom_map_ = new HostZoomMap();
550 return host_zoom_map_.get(); 550 return host_zoom_map_.get();
551 } 551 }
552 552
553 virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() {
554 return profile_->GetGeolocationContentSettingsMap();
555 }
556
557 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() { 553 virtual GeolocationPermissionContext* GetGeolocationPermissionContext() {
558 return profile_->GetGeolocationPermissionContext(); 554 return profile_->GetGeolocationPermissionContext();
559 } 555 }
560 556
561 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() { 557 virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() {
562 return profile_->GetUserStyleSheetWatcher(); 558 return profile_->GetUserStyleSheetWatcher();
563 } 559 }
564 560
565 virtual FindBarState* GetFindBarState() { 561 virtual FindBarState* GetFindBarState() {
566 if (!find_bar_state_.get()) 562 if (!find_bar_state_.get())
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 }; 870 };
875 #endif 871 #endif
876 872
877 Profile* Profile::CreateOffTheRecordProfile() { 873 Profile* Profile::CreateOffTheRecordProfile() {
878 #if defined(OS_CHROMEOS) 874 #if defined(OS_CHROMEOS)
879 if (Profile::IsGuestSession()) 875 if (Profile::IsGuestSession())
880 return new GuestSessionProfile(this); 876 return new GuestSessionProfile(this);
881 #endif 877 #endif
882 return new OffTheRecordProfileImpl(this); 878 return new OffTheRecordProfileImpl(this);
883 } 879 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698