chrome/browser/geolocation/geolocation_infobar_queue_controller.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/geolocation/geolocation_infobar_queue_controller.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/geolocation/chrome_geolocation_permission_context_unittest.cc ('k') | chrome/browser/geolocation/geolocation_settings_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/geolocation/geolocation_infobar_queue_controller.h"	5 #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"

6	6

	7 #include "base/prefs/pref_service.h"

7 #include "chrome/browser/api/infobars/infobar_service.h"	8 #include "chrome/browser/api/infobars/infobar_service.h"

8 #include "chrome/browser/content_settings/host_content_settings_map.h"	9 #include "chrome/browser/content_settings/host_content_settings_map.h"

9 #include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate.h"	10 #include "chrome/browser/geolocation/geolocation_confirm_infobar_delegate.h"

10 #include "chrome/browser/infobars/infobar.h"	11 #include "chrome/browser/infobars/infobar.h"

11 #include "chrome/browser/prefs/pref_service.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/tab_contents/tab_util.h"	13 #include "chrome/browser/tab_contents/tab_util.h"

14 #include "chrome/common/chrome_notification_types.h"	14 #include "chrome/common/chrome_notification_types.h"

15 #include "chrome/common/content_settings.h"	15 #include "chrome/common/content_settings.h"

16 #include "chrome/common/pref_names.h"	16 #include "chrome/common/pref_names.h"

17 #include "content/public/browser/browser_thread.h"	17 #include "content/public/browser/browser_thread.h"

18 #include "content/public/browser/notification_details.h"	18 #include "content/public/browser/notification_details.h"

19 #include "content/public/browser/notification_source.h"	19 #include "content/public/browser/notification_source.h"

20 #include "content/public/browser/notification_types.h"	20 #include "content/public/browser/notification_types.h"

21 #include "content/public/browser/web_contents.h"	21 #include "content/public/browser/web_contents.h"

(...skipping 290 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
312	312

313 ContentSetting content_setting =	313 ContentSetting content_setting =

314 allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;	314 allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;

315 profile_->GetHostContentSettingsMap()->SetContentSetting(	315 profile_->GetHostContentSettingsMap()->SetContentSetting(

316 ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),	316 ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),

317 ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin()),	317 ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin()),

318 CONTENT_SETTINGS_TYPE_GEOLOCATION,	318 CONTENT_SETTINGS_TYPE_GEOLOCATION,

319 std::string(),	319 std::string(),

320 content_setting);	320 content_setting);

321 }	321 }

OLD	NEW