chrome/browser/content_settings/permission_queue_controller.cc - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

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

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win64 suppress warnings Created 6 years, 1 month 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/content_settings/permission_context_base_unittest.cc ('k') | chrome/browser/content_settings/tab_specific_content_settings.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 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/content_settings/permission_queue_controller.h"	5 #include "chrome/browser/content_settings/permission_queue_controller.h"

6	6

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

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

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

10 #include "chrome/browser/content_settings/permission_context_uma_util.h"	9 #include "chrome/browser/content_settings/permission_context_uma_util.h"

11 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"	10 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"

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

13 #include "chrome/browser/media/midi_permission_infobar_delegate.h"	12 #include "chrome/browser/media/midi_permission_infobar_delegate.h"

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

15 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h"	15 #include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h"

17 #include "chrome/browser/tab_contents/tab_util.h"	16 #include "chrome/browser/tab_contents/tab_util.h"

18 #include "chrome/common/pref_names.h"	17 #include "chrome/common/pref_names.h"

	18 #include "components/content_settings/core/browser/host_content_settings_map.h"

19 #include "components/content_settings/core/common/content_settings.h"	19 #include "components/content_settings/core/common/content_settings.h"

20 #include "components/infobars/core/infobar.h"	20 #include "components/infobars/core/infobar.h"

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

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

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

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

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

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

27	27

28 #if defined(OS_ANDROID)	28 #if defined(OS_ANDROID)

(...skipping 346 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
375 ContentSettingsPattern::Wildcard() :	375 ContentSettingsPattern::Wildcard() :

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

377	377

378 profile_->GetHostContentSettingsMap()->SetContentSetting(	378 profile_->GetHostContentSettingsMap()->SetContentSetting(

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

380 embedder_pattern,	380 embedder_pattern,

381 type_,	381 type_,

382 std::string(),	382 std::string(),

383 content_setting);	383 content_setting);

384 }	384 }

OLD	NEW