Skip to content

Commit fc2212d

Browse files
author
joi@chromium.org
committed
Check in temporary keys to aid transition.
TBR=odean@chromium.org BUG=145584 Review URL: https://codereview.chromium.org/10913298 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157145 0039d316-1c4b-4281-b951-d872f2087c98
1 parent db9e74f commit fc2212d

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

google_apis/google_api_keys.cc

+16-17
Original file line numberDiff line numberDiff line change
@@ -36,51 +36,50 @@
3636
#define DUMMY_API_TOKEN "dummytoken"
3737

3838
#if !defined(GOOGLE_API_KEY)
39-
#define GOOGLE_API_KEY DUMMY_API_TOKEN
39+
// TODO(joi): This is temporary; switch to DUMMY_API_TOKEN once people
40+
// have had some time to install API keys per
41+
// http://chromium.org/developers/how-tos/api-keys
42+
#define GOOGLE_API_KEY "AIzaSyBHDrl33hwRp4rMQY0ziRbj8K9LPA6vUCY"
4043
#endif
4144

4245
#if !defined(GOOGLE_CLIENT_ID_MAIN)
43-
// TODO(joi): Use DUMMY_API_TOKEN here once folks on chromium-dev have
44-
// had a couple of days to update their include.gypi.
45-
#define GOOGLE_CLIENT_ID_MAIN "77185425430.apps.googleusercontent.com"
46+
#define GOOGLE_CLIENT_ID_MAIN DUMMY_API_TOKEN
4647
#endif
4748

4849
#if !defined(GOOGLE_CLIENT_SECRET_MAIN)
49-
// TODO(joi): As above.
50-
#define GOOGLE_CLIENT_SECRET_MAIN "OTJgUOQcT7lO7GsGZq2G4IlT"
50+
#define GOOGLE_CLIENT_SECRET_MAIN DUMMY_API_TOKEN
5151
#endif
5252

5353
#if !defined(GOOGLE_CLIENT_ID_CLOUD_PRINT)
54-
// TODO(joi): As above.
55-
#define GOOGLE_CLIENT_ID_CLOUD_PRINT "551556820943.apps.googleusercontent.com"
54+
#define GOOGLE_CLIENT_ID_CLOUD_PRINT DUMMY_API_TOKEN
5655
#endif
5756

5857
#if !defined(GOOGLE_CLIENT_SECRET_CLOUD_PRINT)
59-
// TODO(joi): As above.
60-
#define GOOGLE_CLIENT_SECRET_CLOUD_PRINT "u3/mp8CgLFxh4uiX1855/MHe"
58+
#define GOOGLE_CLIENT_SECRET_CLOUD_PRINT DUMMY_API_TOKEN
6159
#endif
6260

6361
#if !defined(GOOGLE_CLIENT_ID_REMOTING)
64-
// TODO(joi): As above.
65-
#define GOOGLE_CLIENT_ID_REMOTING \
66-
"440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com"
62+
#define GOOGLE_CLIENT_ID_REMOTING DUMMY_API_TOKEN
6763
#endif
6864

6965
#if !defined(GOOGLE_CLIENT_SECRET_REMOTING)
70-
// TODO(joi): As above.
71-
#define GOOGLE_CLIENT_SECRET_REMOTING "Bgur6DFiOMM1h8x-AQpuTQlK"
66+
#define GOOGLE_CLIENT_SECRET_REMOTING DUMMY_API_TOKEN
7267
#endif
7368

7469
// These are used as shortcuts for developers and users providing
7570
// OAuth credentials via preprocessor defines or environment
7671
// variables. If set, they will be used to replace any of the client
7772
// IDs and secrets above that have not been set (and only those; they
7873
// will not override already-set values).
74+
//
75+
// TODO(joi): This is temporary; make both blank once people have had
76+
// some time to install API keys per
77+
// http://chromium.org/developers/how-tos/api-keys
7978
#if !defined(GOOGLE_DEFAULT_CLIENT_ID)
80-
#define GOOGLE_DEFAULT_CLIENT_ID ""
79+
#define GOOGLE_DEFAULT_CLIENT_ID "609716072145.apps.googleusercontent.com"
8180
#endif
8281
#if !defined(GOOGLE_DEFAULT_CLIENT_SECRET)
83-
#define GOOGLE_DEFAULT_CLIENT_SECRET ""
82+
#define GOOGLE_DEFAULT_CLIENT_SECRET "WF4uG3gJzEH0KLpS7OuFBDux"
8483
#endif
8584

8685
namespace switches {

0 commit comments

Comments
 (0)