diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 05:50:15 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 05:50:15 +0000 |
| commit | 87690d99c17ae5b7dd1c1bd465d661d24aec72d3 (patch) | |
| tree | d2843585feadff613380a6a51926e1ee2904b4a3 /remoting | |
| parent | 1c0b3147ef6a6b8b81bb9feb51237dba5319237d (diff) | |
| download | chromium_src-87690d99c17ae5b7dd1c1bd465d661d24aec72d3.zip chromium_src-87690d99c17ae5b7dd1c1bd465d661d24aec72d3.tar.gz chromium_src-87690d99c17ae5b7dd1c1bd465d661d24aec72d3.tar.bz2 | |
remoting: Fix invalid use of std::string used in the global scope.
We shouldn't declare global variables of class types, because they are forbidden by
the style guide. See http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Static_and_Global_Variables#Static_and_Global_Variables for futher information.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/2873021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/base/constants.cc | 4 | ||||
| -rw-r--r-- | remoting/base/constants.h | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/remoting/base/constants.cc b/remoting/base/constants.cc index 0255200..0449dc5 100644 --- a/remoting/base/constants.cc +++ b/remoting/base/constants.cc @@ -6,9 +6,9 @@ namespace remoting { -const std::string kChromotingBotJid("remoting@bot.talk.google.com"); +const char kChromotingBotJid[] = "remoting@bot.talk.google.com"; // TODO(sergeyu): Use chromoting's own service name here instead of sync. -const std::string kChromotingTokenServiceName("chromiumsync"); +const char kChromotingTokenServiceName[] = "chromiumsync"; } // namespace remoting diff --git a/remoting/base/constants.h b/remoting/base/constants.h index 6c2bb17..d124172 100644 --- a/remoting/base/constants.h +++ b/remoting/base/constants.h @@ -2,18 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef REMOTING_BASE_CONSTANTS_H -#define REMOTING_BASE_CONSTANTS_H - -#include <string> +#ifndef REMOTING_BASE_CONSTANTS_H_ +#define REMOTING_BASE_CONSTANTS_H_ namespace remoting { -extern const std::string kChromotingBotJid; +extern const char kChromotingBotJid[]; // Service name used for authentication. -extern const std::string kChromotingTokenServiceName; +extern const char kChromotingTokenServiceName[]; } // namespace remoting -#endif // REMOTING_BASE_CONSTANTS_H +#endif // REMOTING_BASE_CONSTANTS_H_ |