diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-08 19:57:19 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-08 19:57:19 +0000 |
| commit | 6a7caecdde50da45cc993a7c98eb40066a0f41e9 (patch) | |
| tree | ef4e36497d86a059a4415889a727d5f495eb724d /google_apis/google_api_keys.cc | |
| parent | c583b71f5167f4e73e6dcbdbda72d96d9807e3e7 (diff) | |
| download | chromium_src-6a7caecdde50da45cc993a7c98eb40066a0f41e9.zip chromium_src-6a7caecdde50da45cc993a7c98eb40066a0f41e9.tar.gz chromium_src-6a7caecdde50da45cc993a7c98eb40066a0f41e9.tar.bz2 | |
Cleaning up TODOs in //google_apis.
The build warning is no longer necessary as we now have an infobar
show up to warn developers if API keys haven't been set.
The Python API may never need to be better than it is today, so
removing the TODO there; it will be improved if and when needed.
The underlying reason for the inconsistent semantics between setting
the GOOGLE_DEFAULT_CLIENT_ID/SECRET environment variables and the
google_default_client_id/secret gyp variables is gone, so I fixed this
mismatch in the current change.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/18851002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/google_api_keys.cc')
| -rw-r--r-- | google_apis/google_api_keys.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc index 034b69a..fc4b547 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc @@ -17,22 +17,6 @@ #include "google_apis/internal/google_chrome_api_keys.h" #endif -// TODO(joi): Can we enable this warning without having it treated as -// an error? We don't want to fail builds, just warn, but all warnings -// from the preprocessor are currently treated as errors, at least in -// Linux builds. -#if 0 -#if !defined(GOOGLE_API_KEY) && ( \ - (!defined(GOOGLE_DEFAULT_CLIENT_ID) && \ - !defined(GOOGLE_DEFAULT_CLIENT_SECRET)) \ - || \ - (!defined(GOOGLE_CLIENT_ID_MAIN) && \ - !defined(GOOGLE_CLIENT_SECRET_MAIN))) -#warning You have not specified API keys; some features may not work. -#warning See www.chromium.org/developers/how-tos/api-keys for details. -#endif // (API keys unset) -#endif // 0 - // Used to indicate an unset key/id/secret. This works better with // various unit tests than leaving the token empty. #define DUMMY_API_TOKEN "dummytoken" |