chrome/browser/notifications/desktop_notification_service.cc - Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/notifications/desktop_notification_service.cc

Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Keeping up to date with trunk. Created 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/geolocation/geolocation_browsertest.cc ('k') | chrome/browser/notifications/notification_exceptions_table_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/desktop_notification_service.cc

diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc

index 89e7d38f560b87877b4f8a16930bb4527a60c7d1..7b2ae5026169fee2d6a9b535e005e11d8b08e587 100644

--- a/chrome/browser/notifications/desktop_notification_service.cc

+++ b/chrome/browser/notifications/desktop_notification_service.cc

@@ -8,7 +8,6 @@

#include "base/threading/thread.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/content_settings/content_settings_details.h"

-#include "chrome/browser/content_settings/content_settings_pattern.h"

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

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

#include "chrome/browser/extensions/extension_service.h"

@@ -24,6 +23,7 @@

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/content_settings_pattern.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "content/browser/browser_child_process_host.h"