chrome/browser/push_messaging/push_messaging_service_impl.cc - Issue 2657823005: Move //c/b/services/gcm/ to //c/b/gcm/

Side by Side Diff: chrome/browser/push_messaging/push_messaging_service_impl.cc

Issue 2657823005: Move //c/b/services/gcm/ to //c/b/gcm/ (Closed)

Patch Set: Created 3 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:

« no previous file with comments | « chrome/browser/push_messaging/push_messaging_service_factory.cc ('k') | chrome/browser/push_messaging/push_messaging_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

11 #include "base/bind.h"	11 #include "base/bind.h"

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

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

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

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

16 #include "base/logging.h"	16 #include "base/logging.h"

17 #include "base/metrics/histogram_macros.h"	17 #include "base/metrics/histogram_macros.h"

18 #include "base/strings/string_util.h"	18 #include "base/strings/string_util.h"

19 #include "base/threading/thread_task_runner_handle.h"	19 #include "base/threading/thread_task_runner_handle.h"

20 #include "build/build_config.h"	20 #include "build/build_config.h"

21 #include "chrome/browser/browser_process.h"	21 #include "chrome/browser/browser_process.h"

22 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"	22 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"

	23 #include "chrome/browser/gcm/gcm_profile_service_factory.h"

	24 #include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"

	25 #include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"

23 #include "chrome/browser/permissions/permission_manager.h"	26 #include "chrome/browser/permissions/permission_manager.h"

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

25 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"	28 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"

26 #include "chrome/browser/push_messaging/push_messaging_constants.h"	29 #include "chrome/browser/push_messaging/push_messaging_constants.h"

27 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"	30 #include "chrome/browser/push_messaging/push_messaging_service_factory.h"

28 #include "chrome/browser/push_messaging/push_messaging_service_observer.h"	31 #include "chrome/browser/push_messaging/push_messaging_service_observer.h"

29 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"

30 #include "chrome/browser/services/gcm/instance_id/instance_id_profile_service.h"

31 #include "chrome/browser/services/gcm/instance_id/instance_id_profile_service_fa ctory.h"

32 #include "chrome/browser/ui/chrome_pages.h"	32 #include "chrome/browser/ui/chrome_pages.h"

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

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

35 #include "chrome/common/features.h"	35 #include "chrome/common/features.h"

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

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

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

39 #include "components/gcm_driver/gcm_driver.h"	39 #include "components/gcm_driver/gcm_driver.h"

40 #include "components/gcm_driver/gcm_profile_service.h"	40 #include "components/gcm_driver/gcm_profile_service.h"

41 #include "components/gcm_driver/instance_id/instance_id.h"	41 #include "components/gcm_driver/instance_id/instance_id.h"

(...skipping 963 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1005 }	1005 }

1006	1006

1007 instance_id::InstanceIDDriver* PushMessagingServiceImpl::GetInstanceIDDriver()	1007 instance_id::InstanceIDDriver* PushMessagingServiceImpl::GetInstanceIDDriver()

1008 const {	1008 const {

1009 instance_id::InstanceIDProfileService* instance_id_profile_service =	1009 instance_id::InstanceIDProfileService* instance_id_profile_service =

1010 instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile_);	1010 instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile_);

1011 CHECK(instance_id_profile_service);	1011 CHECK(instance_id_profile_service);

1012 CHECK(instance_id_profile_service->driver());	1012 CHECK(instance_id_profile_service->driver());

1013 return instance_id_profile_service->driver();	1013 return instance_id_profile_service->driver();

1014 }	1014 }

OLD	NEW