chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 2510803003: Pass RapporService to content/browser/

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 2510803003: Pass RapporService to content/browser/ (Closed)

Patch Set: Fix more compile errors in JNI files Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.h ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc » ('j') | components/security_interstitials/core/metrics_helper.cc » ('J')
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/ui/content_settings/content_setting_bubble_model.h"	5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/feature_list.h"	10 #include "base/feature_list.h"

(...skipping 20 matching lines...) Expand all Loading...
31 #include "chrome/common/chrome_features.h"	31 #include "chrome/common/chrome_features.h"

32 #include "chrome/common/chrome_switches.h"	32 #include "chrome/common/chrome_switches.h"

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

34 #include "chrome/common/render_messages.h"	34 #include "chrome/common/render_messages.h"

35 #include "chrome/grit/generated_resources.h"	35 #include "chrome/grit/generated_resources.h"

36 #include "chrome/grit/theme_resources.h"	36 #include "chrome/grit/theme_resources.h"

37 #include "components/content_settings/core/browser/content_settings_utils.h"	37 #include "components/content_settings/core/browser/content_settings_utils.h"

38 #include "components/content_settings/core/browser/cookie_settings.h"	38 #include "components/content_settings/core/browser/cookie_settings.h"

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

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

41 #include "components/rappor/rappor_utils.h"	41 #include "components/rappor/public/rappor_utils.h"

	42 #include "components/rappor/rappor_service_impl.h"

42 #include "components/strings/grit/components_strings.h"	43 #include "components/strings/grit/components_strings.h"

43 #include "components/subresource_filter/content/browser/content_subresource_filt er_driver_factory.h"	44 #include "components/subresource_filter/content/browser/content_subresource_filt er_driver_factory.h"

44 #include "components/url_formatter/elide_url.h"	45 #include "components/url_formatter/elide_url.h"

45 #include "content/public/browser/notification_service.h"	46 #include "content/public/browser/notification_service.h"

46 #include "content/public/browser/render_frame_host.h"	47 #include "content/public/browser/render_frame_host.h"

47 #include "content/public/browser/render_process_host.h"	48 #include "content/public/browser/render_process_host.h"

48 #include "content/public/browser/render_view_host.h"	49 #include "content/public/browser/render_view_host.h"

49 #include "content/public/browser/user_metrics.h"	50 #include "content/public/browser/user_metrics.h"

50 #include "content/public/browser/web_contents.h"	51 #include "content/public/browser/web_contents.h"

51 #include "content/public/browser/web_contents_delegate.h"	52 #include "content/public/browser/web_contents_delegate.h"

(...skipping 1422 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1474 ContentSettingMediaStreamBubbleModel*	1475 ContentSettingMediaStreamBubbleModel*

1475 ContentSettingBubbleModel::AsMediaStreamBubbleModel() {	1476 ContentSettingBubbleModel::AsMediaStreamBubbleModel() {

1476 // In general, bubble models might not inherit from the media bubble model.	1477 // In general, bubble models might not inherit from the media bubble model.

1477 return nullptr;	1478 return nullptr;

1478 }	1479 }

1479	1480

1480 ContentSettingSubresourceFilterBubbleModel*	1481 ContentSettingSubresourceFilterBubbleModel*

1481 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {	1482 ContentSettingBubbleModel::AsSubresourceFilterBubbleModel() {

1482 return nullptr;	1483 return nullptr;

1483 }	1484 }

OLD	NEW