diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 21:56:59 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 21:56:59 +0000 |
| commit | 6e03f13449539e06243c421ba5e8fd35224ad9ba (patch) | |
| tree | 0adfdfd3ca736d41473980c05423a2ec416a576f /tools/android | |
| parent | 731809ee62616107a996557f54857019952b500b (diff) | |
| download | chromium_src-6e03f13449539e06243c421ba5e8fd35224ad9ba.zip chromium_src-6e03f13449539e06243c421ba5e8fd35224ad9ba.tar.gz chromium_src-6e03f13449539e06243c421ba5e8fd35224ad9ba.tar.bz2 | |
Fix style issues of tools/android
Review URL: http://codereview.chromium.org/9402017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/common/adb_connection.h | 6 | ||||
| -rw-r--r-- | tools/android/common/common.gyp | 8 | ||||
| -rw-r--r-- | tools/android/common/daemon.h | 14 | ||||
| -rw-r--r-- | tools/android/forwarder/forwarder.gyp | 6 |
4 files changed, 13 insertions, 21 deletions
diff --git a/tools/android/common/adb_connection.h b/tools/android/common/adb_connection.h index 48a1a6f..9d59d07 100644 --- a/tools/android/common/adb_connection.h +++ b/tools/android/common/adb_connection.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 TOOLS_ANDROID_COMMON_ADB_CONNECTION_H__ -#define TOOLS_ANDROID_COMMON_ADB_CONNECTION_H__ +#ifndef TOOLS_ANDROID_COMMON_ADB_CONNECTION_H_ +#define TOOLS_ANDROID_COMMON_ADB_CONNECTION_H_ #pragma once namespace tools { @@ -15,5 +15,5 @@ int ConnectAdbHostSocket(const char* forward_to); } // namespace tools -#endif // TOOLS_ANDROID_COMMON_ADB_CONNECTION_H__ +#endif // TOOLS_ANDROID_COMMON_ADB_CONNECTION_H_ diff --git a/tools/android/common/common.gyp b/tools/android/common/common.gyp index 54e2976..17c4821 100644 --- a/tools/android/common/common.gyp +++ b/tools/android/common/common.gyp @@ -13,15 +13,13 @@ ], 'sources': [ 'adb_connection.cc', + 'adb_connection.h', 'daemon.cc', + 'daemon.h', 'net.cc', + 'net.h', ], }, ], } -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/tools/android/common/daemon.h b/tools/android/common/daemon.h index 2bd25d4..063c440 100644 --- a/tools/android/common/daemon.h +++ b/tools/android/common/daemon.h @@ -2,13 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef TOOLS_ANDROID_COMMON_DAEMON_H__ -#define TOOLS_ANDROID_COMMON_DAEMON_H__ +#ifndef TOOLS_ANDROID_COMMON_DAEMON_H_ +#define TOOLS_ANDROID_COMMON_DAEMON_H_ #pragma once -#include <string> -#include <vector> - class CommandLine; namespace tools { @@ -21,11 +18,12 @@ void ShowHelp(const char* program, const char* extra_title, const char* extra_descriptions); -// Spawns a daemon process and exit the current process. -// Any code after this function will be executed in the spawned daemon process. +// Spawns a daemon process and exits the current process with exit_status. +// Any code executed after this function returns will be executed in the +// spawned daemon process. void SpawnDaemon(int exit_status); } // namespace tools -#endif // TOOLS_ANDROID_COMMON_DAEMON_H__ +#endif // TOOLS_ANDROID_COMMON_DAEMON_H_ diff --git a/tools/android/forwarder/forwarder.gyp b/tools/android/forwarder/forwarder.gyp index 75390c3..971230c 100644 --- a/tools/android/forwarder/forwarder.gyp +++ b/tools/android/forwarder/forwarder.gyp @@ -1,6 +1,7 @@ # Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. + { 'targets': [ { @@ -40,8 +41,3 @@ ], } -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: |