chrome/browser/notifications/desktop_notification_service.h - Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo…

Side by Side Diff: chrome/browser/notifications/desktop_notification_service.h

Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix chrome/browser/BUILD.gn Created 6 years, 3 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/notifications/desktop_notification_profile_util.cc ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | chrome/browser/notifications/desktop_notification_service.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 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_	5 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_

6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_	6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_

7	7

8 #include <set>	8 #include <set>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

11	11

12 #include "base/basictypes.h"	12 #include "base/basictypes.h"

13 #include "base/callback_forward.h"	13 #include "base/callback_forward.h"

14 #include "base/memory/ref_counted.h"	14 #include "base/memory/ref_counted.h"

15 #include "base/memory/scoped_ptr.h"	15 #include "base/memory/scoped_ptr.h"

16 #include "base/memory/weak_ptr.h"	16 #include "base/memory/weak_ptr.h"

17 #include "base/prefs/pref_member.h"	17 #include "base/prefs/pref_member.h"

18 #include "base/scoped_observer.h"	18 #include "base/scoped_observer.h"

19 #include "base/strings/string16.h"	19 #include "base/strings/string16.h"

20 #include "chrome/browser/content_settings/content_settings_provider.h"

21 #include "chrome/browser/content_settings/permission_context_base.h"	20 #include "chrome/browser/content_settings/permission_context_base.h"

22 #include "chrome/browser/notifications/extension_welcome_notification.h"	21 #include "chrome/browser/notifications/extension_welcome_notification.h"

	22 #include "components/content_settings/core/browser/content_settings_provider.h"
	vabr (Chromium) 2014/09/18 08:54:57 You can remove this line, and also a fwd declarati You can remove this line, and also a fwd declaration of ContentSettingsPattern below, see https://codereview.chromium.org/430813004/diff/70001/chrome/browser/notificat... vasilii 2014/09/18 09:45:41 Done. Show quoted text On 2014/09/18 08:54:57, vabr (Chromium) wrote: > You can remove this line, and also a fwd declaration of ContentSettingsPattern > below, see > https://codereview.chromium.org/430813004/diff/70001/chrome/browser/notificat... Done.
23 #include "components/content_settings/core/common/content_settings.h"	23 #include "components/content_settings/core/common/content_settings.h"

24 #include "components/keyed_service/core/keyed_service.h"	24 #include "components/keyed_service/core/keyed_service.h"

25 #include "extensions/browser/extension_registry_observer.h"	25 #include "extensions/browser/extension_registry_observer.h"

26 #include "third_party/WebKit/public/platform/WebNotificationPermission.h"	26 #include "third_party/WebKit/public/platform/WebNotificationPermission.h"

27 #include "third_party/WebKit/public/web/WebTextDirection.h"	27 #include "third_party/WebKit/public/web/WebTextDirection.h"

28 #include "ui/message_center/notifier_settings.h"	28 #include "ui/message_center/notifier_settings.h"

29 #include "url/gurl.h"	29 #include "url/gurl.h"

30	30

31 class ContentSettingsPattern;	31 class ContentSettingsPattern;

32 class Notification;	32 class Notification;

(...skipping 125 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158	158

159 // Welcome Notification	159 // Welcome Notification

160 scoped_ptr<ExtensionWelcomeNotification> chrome_now_welcome_notification_;	160 scoped_ptr<ExtensionWelcomeNotification> chrome_now_welcome_notification_;

161	161

162 base::WeakPtrFactory<DesktopNotificationService> weak_factory_;	162 base::WeakPtrFactory<DesktopNotificationService> weak_factory_;

163	163

164 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);	164 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);

165 };	165 };

166	166

167 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_	167 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_

OLD	NEW