chrome/browser/chrome_content_browser_client.cc - Issue 955673004: Move gcm-independent parts of push messaging out of gcm namespace and directory

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/chrome_content_browser_client.cc

Issue 955673004: Move gcm-independent parts of push messaging out of gcm namespace and directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: buildfix push_messaging_application_id_unittest Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/browser/notifications/platform_notification_service_impl.h » ('j') | chrome/browser/push_messaging/push_messaging_service_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index be00c5c456562636282576bdfb0288ac96e48f09..79e86713b74b8802c8f94636706040046d4c4d6e 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -56,14 +56,14 @@

#include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"

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

#include "chrome/browser/profiles/profile_io_data.h"

+#include "chrome/browser/push_messaging/push_messaging_permission_context.h"

+#include "chrome/browser/push_messaging/push_messaging_permission_context_factory.h"

#include "chrome/browser/renderer_host/chrome_render_message_filter.h"

#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"

#include "chrome/browser/search/instant_service.h"

#include "chrome/browser/search/instant_service_factory.h"

#include "chrome/browser/search/search.h"

#include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"

-#include "chrome/browser/services/gcm/push_messaging_permission_context.h"

-#include "chrome/browser/services/gcm/push_messaging_permission_context_factory.h"

#include "chrome/browser/signin/principals_message_filter.h"

#include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"

#include "chrome/browser/speech/tts_controller.h"

@@ -650,7 +650,7 @@ PermissionContextBase* GetPermissionContext(Profile* profile,

break;

#endif

case content::PERMISSION_PUSH_MESSAGING:

- return gcm::PushMessagingPermissionContextFactory::GetForProfile(profile);

+ return PushMessagingPermissionContextFactory::GetForProfile(profile);

case content::PERMISSION_NUM:

NOTREACHED() << "Invalid RequestPermission for " << permission;

break;