components/invalidation/gcm_network_channel.cc - Issue 1178683009: Change histogram.h includes to histogram_macros.h in components/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: components/invalidation/gcm_network_channel.cc

Issue 1178683009: Change histogram.h includes to histogram_macros.h in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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

« components/history/core/browser/top_sites_impl_unittest.cc ('K') | « components/history/core/browser/top_sites_impl_unittest.cc ('k') | components/invalidation/ticl_invalidation_service.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 "base/base64.h"	5 #include "base/base64.h"

6 #include "base/i18n/time_formatting.h"	6 #include "base/i18n/time_formatting.h"

7 #include "base/location.h"	7 #include "base/location.h"

8 #include "base/metrics/histogram.h"	8 #include "base/metrics/histogram_macros.h"

9 #include "base/sha1.h"	9 #include "base/sha1.h"

10 #include "base/single_thread_task_runner.h"	10 #include "base/single_thread_task_runner.h"

11 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

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

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

14 #if !defined(OS_ANDROID)	14 #if !defined(OS_ANDROID)

15 // channel_common.proto defines ANDROID constant that conflicts with Android	15 // channel_common.proto defines ANDROID constant that conflicts with Android

16 // build. At the same time TiclInvalidationService is not used on Android so it	16 // build. At the same time TiclInvalidationService is not used on Android so it

17 // is safe to exclude these protos from Android build.	17 // is safe to exclude these protos from Android build.

18 #include "google/cacheinvalidation/android_channel.pb.h"	18 #include "google/cacheinvalidation/android_channel.pb.h"

(...skipping 431 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
450 ENUM_CASE(gcm::GCMClient::UNKNOWN_ERROR);	450 ENUM_CASE(gcm::GCMClient::UNKNOWN_ERROR);

451 ENUM_CASE(gcm::GCMClient::INVALID_PARAMETER);	451 ENUM_CASE(gcm::GCMClient::INVALID_PARAMETER);

452 ENUM_CASE(gcm::GCMClient::ASYNC_OPERATION_PENDING);	452 ENUM_CASE(gcm::GCMClient::ASYNC_OPERATION_PENDING);

453 ENUM_CASE(gcm::GCMClient::GCM_DISABLED);	453 ENUM_CASE(gcm::GCMClient::GCM_DISABLED);

454 }	454 }

455 NOTREACHED();	455 NOTREACHED();

456 return "";	456 return "";

457 }	457 }

458	458

459 } // namespace syncer	459 } // namespace syncer

OLD	NEW