diff options
| author | bnc <bnc@chromium.org> | 2015-03-09 13:47:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-09 20:48:48 +0000 |
| commit | 2220bd6553b4aae764ed66b24f5aa6e398c70b68 (patch) | |
| tree | 42a41c557a79bf89067e9db4ede1a77d270e1cf8 /base/mac | |
| parent | 79f7a57302cae3f7afcd53c6dff542e32bada999 (diff) | |
| download | chromium_src-2220bd6553b4aae764ed66b24f5aa6e398c70b68.zip chromium_src-2220bd6553b4aae764ed66b24f5aa6e398c70b68.tar.gz chromium_src-2220bd6553b4aae764ed66b24f5aa6e398c70b68.tar.bz2 | |
Revert of base: Fix/add header #ifndef guards. (patchset #2 id:20001 of https://codereview.chromium.org/985003004/)
Reason for revert:
This seems to be causing tree closing compile failure https://build.chromium.org/p/chromium/builders/Android/builds/36135/steps/compile/logs/stdio.
Original issue's description:
> base: Fix/add header #ifndef guards.
>
> Header guards should be defined based on the path and file name of the
> header file. Some headers have it wrong, some are missing the guards,
> and some just have the matching comment wrong.
>
> R=Nico
> BUG=464816
>
> Committed: https://crrev.com/301b392761fd8f66f3a701ab1dd011c6e7a55e19
> Cr-Commit-Position: refs/heads/master@{#319722}
TBR=thakis@chromium.org,danakj@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=464816
Review URL: https://codereview.chromium.org/989343002
Cr-Commit-Position: refs/heads/master@{#319728}
Diffstat (limited to 'base/mac')
| -rw-r--r-- | base/mac/cocoa_protocols.h | 6 | ||||
| -rw-r--r-- | base/mac/libdispatch_task_runner.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/base/mac/cocoa_protocols.h b/base/mac/cocoa_protocols.h index a28795c..ab34a19 100644 --- a/base/mac/cocoa_protocols.h +++ b/base/mac/cocoa_protocols.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_MAC_COCOA_PROTOCOLS_H_ -#define BASE_MAC_COCOA_PROTOCOLS_H_ +#ifndef BASE_COCOA_PROTOCOLS_MAC_H_ +#define BASE_COCOA_PROTOCOLS_MAC_H_ #import <Cocoa/Cocoa.h> @@ -28,4 +28,4 @@ DEFINE_EMPTY_PROTOCOL(ICCameraDeviceDownloadDelegate) #undef DEFINE_EMPTY_PROTOCOL -#endif // BASE_MAC_COCOA_PROTOCOLS_H_ +#endif // BASE_COCOA_PROTOCOLS_MAC_H_ diff --git a/base/mac/libdispatch_task_runner.h b/base/mac/libdispatch_task_runner.h index b479bc7..f5fd866 100644 --- a/base/mac/libdispatch_task_runner.h +++ b/base/mac/libdispatch_task_runner.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_MAC_LIBDISPATCH_TASK_RUNNER_H_ -#define BASE_MAC_LIBDISPATCH_TASK_RUNNER_H_ +#ifndef BASE_MAC_LIBDISPATCH_SEQUENCED_TASK_RUNNER_H_ +#define BASE_MAC_LIBDISPATCH_SEQUENCED_TASK_RUNNER_H_ #include <dispatch/dispatch.h> @@ -77,4 +77,4 @@ class BASE_EXPORT LibDispatchTaskRunner : public base::SingleThreadTaskRunner { } // namespace mac } // namespace base -#endif // BASE_MAC_LIBDISPATCH_TASK_RUNNER_H_ +#endif // BASE_MAC_LIBDISPATCH_SEQUENCED_TASK_RUNNER_H_ |