chrome/browser/permissions/permission_queue_controller.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/permissions/permission_queue_controller.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« no previous file with comments | « chrome/browser/permissions/permission_context_base.cc ('k') | chrome/browser/plugins/plugin_finder.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/permissions/permission_queue_controller.h"	5 #include "chrome/browser/permissions/permission_queue_controller.h"

6	6

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

8 #include "chrome/browser/chrome_notification_types.h"	7 #include "chrome/browser/chrome_notification_types.h"

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

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

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

12 #include "chrome/browser/media/midi_permission_infobar_delegate_android.h"	11 #include "chrome/browser/media/midi_permission_infobar_delegate_android.h"

13 #include "chrome/browser/media/protected_media_identifier_infobar_delegate_andro id.h"	12 #include "chrome/browser/media/protected_media_identifier_infobar_delegate_andro id.h"

14 #include "chrome/browser/notifications/notification_permission_infobar_delegate. h"	13 #include "chrome/browser/notifications/notification_permission_infobar_delegate. h"

15 #include "chrome/browser/permissions/permission_request_id.h"	14 #include "chrome/browser/permissions/permission_request_id.h"

16 #include "chrome/browser/permissions/permission_uma_util.h"	15 #include "chrome/browser/permissions/permission_uma_util.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/browser/storage/durable_storage_permission_infobar_delegate_and roid.h"	17 #include "chrome/browser/storage/durable_storage_permission_infobar_delegate_and roid.h"

19 #include "chrome/browser/tab_contents/tab_util.h"	18 #include "chrome/browser/tab_contents/tab_util.h"

20 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

21 #include "components/content_settings/core/browser/host_content_settings_map.h"	20 #include "components/content_settings/core/browser/host_content_settings_map.h"

22 #include "components/content_settings/core/common/content_settings.h"	21 #include "components/content_settings/core/common/content_settings.h"

23 #include "components/infobars/core/infobar.h"	22 #include "components/infobars/core/infobar.h"

	23 #include "components/prefs/pref_service.h"

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

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

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

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

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

29 #include "content/public/common/url_constants.h"	29 #include "content/public/common/url_constants.h"

30	30

31 namespace {	31 namespace {

32	32

33 InfoBarService* GetInfoBarService(const PermissionRequestID& id) {	33 InfoBarService* GetInfoBarService(const PermissionRequestID& id) {

(...skipping 367 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
401	401

402 ContentSettingsPattern embedder_pattern =	402 ContentSettingsPattern embedder_pattern =

403 (content_settings_type_ == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)	403 (content_settings_type_ == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)

404 ? ContentSettingsPattern::Wildcard()	404 ? ContentSettingsPattern::Wildcard()

405 : ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin());	405 : ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin());

406	406

407 HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(	407 HostContentSettingsMapFactory::GetForProfile(profile_)->SetContentSetting(

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

409 embedder_pattern, content_settings_type_, std::string(), content_setting);	409 embedder_pattern, content_settings_type_, std::string(), content_setting);

410 }	410 }

OLD	NEW