Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: chrome/browser/push_messaging/push_messaging_service_impl.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:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/push_messaging/push_messaging_service_impl.h" 5 #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/barrier_closure.h" 9 #include "base/barrier_closure.h"
10 #include "base/base64url.h" 10 #include "base/base64url.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/common/features.h" 34 #include "chrome/common/features.h"
35 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
36 #include "chrome/grit/generated_resources.h" 36 #include "chrome/grit/generated_resources.h"
37 #include "components/content_settings/core/browser/host_content_settings_map.h" 37 #include "components/content_settings/core/browser/host_content_settings_map.h"
38 #include "components/gcm_driver/gcm_driver.h" 38 #include "components/gcm_driver/gcm_driver.h"
39 #include "components/gcm_driver/gcm_profile_service.h" 39 #include "components/gcm_driver/gcm_profile_service.h"
40 #include "components/gcm_driver/instance_id/instance_id.h" 40 #include "components/gcm_driver/instance_id/instance_id.h"
41 #include "components/gcm_driver/instance_id/instance_id_driver.h" 41 #include "components/gcm_driver/instance_id/instance_id_driver.h"
42 #include "components/pref_registry/pref_registry_syncable.h" 42 #include "components/pref_registry/pref_registry_syncable.h"
43 #include "components/prefs/pref_service.h" 43 #include "components/prefs/pref_service.h"
44 #include "components/rappor/rappor_utils.h" 44 #include "components/rappor/public/rappor_utils.h"
45 #include "components/rappor/rappor_service_impl.h"
45 #include "content/public/browser/browser_context.h" 46 #include "content/public/browser/browser_context.h"
46 #include "content/public/browser/permission_type.h" 47 #include "content/public/browser/permission_type.h"
47 #include "content/public/browser/render_frame_host.h" 48 #include "content/public/browser/render_frame_host.h"
48 #include "content/public/browser/service_worker_context.h" 49 #include "content/public/browser/service_worker_context.h"
49 #include "content/public/browser/storage_partition.h" 50 #include "content/public/browser/storage_partition.h"
50 #include "content/public/browser/web_contents.h" 51 #include "content/public/browser/web_contents.h"
51 #include "content/public/common/child_process_host.h" 52 #include "content/public/common/child_process_host.h"
52 #include "content/public/common/content_switches.h" 53 #include "content/public/common/content_switches.h"
53 #include "content/public/common/push_messaging_status.h" 54 #include "content/public/common/push_messaging_status.h"
54 #include "content/public/common/push_subscription_options.h" 55 #include "content/public/common/push_subscription_options.h"
(...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 } 974 }
974 975
975 instance_id::InstanceIDDriver* PushMessagingServiceImpl::GetInstanceIDDriver() 976 instance_id::InstanceIDDriver* PushMessagingServiceImpl::GetInstanceIDDriver()
976 const { 977 const {
977 instance_id::InstanceIDProfileService* instance_id_profile_service = 978 instance_id::InstanceIDProfileService* instance_id_profile_service =
978 instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile_); 979 instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile_);
979 CHECK(instance_id_profile_service); 980 CHECK(instance_id_profile_service);
980 CHECK(instance_id_profile_service->driver()); 981 CHECK(instance_id_profile_service->driver());
981 return instance_id_profile_service->driver(); 982 return instance_id_profile_service->driver();
982 } 983 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698