diff options
author | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 15:56:28 +0000 |
---|---|---|
committer | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 15:56:28 +0000 |
commit | 850b353e5c5218cc3a7cf217475d69d4f7772f85 (patch) | |
tree | d8e51a0835168b5b7583dcdcb814c797917489e6 /google_apis/google_api_keys.cc | |
parent | f1a854a0a2bfce12cc2dd9f55d655a9d324a85d6 (diff) | |
download | chromium_src-850b353e5c5218cc3a7cf217475d69d4f7772f85.zip chromium_src-850b353e5c5218cc3a7cf217475d69d4f7772f85.tar.gz chromium_src-850b353e5c5218cc3a7cf217475d69d4f7772f85.tar.bz2 |
Move OAuth2 client id and secret switches to gaia_switches.h
The OAuth2 client id and secret switches are also used on Chrome for iOS
downstream so they need to be available in a public header.
BUG=285944
Review URL: https://codereview.chromium.org/141653020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/google_api_keys.cc')
-rw-r--r-- | google_apis/google_api_keys.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc index 2cf92fd..f879979 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringize_macros.h" +#include "google_apis/gaia/gaia_switches.h" #if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS) #include "google_apis/internal/google_chrome_api_keys.h" @@ -69,16 +70,6 @@ #define GOOGLE_DEFAULT_CLIENT_SECRET "" #endif -namespace switches { - -// Specifies custom OAuth2 client id for testing purposes. -const char kOAuth2ClientID[] = "oauth2-client-id"; - -// Specifies custom OAuth2 client secret for testing purposes. -const char kOAuth2ClientSecret[] = "oauth2-client-secret"; - -} // namespace switches - namespace google_apis { // This is used as a lazy instance to determine keys once and cache them. |