| Index: chrome/common/omaha_query_params/omaha_query_params.cc
|
| diff --git a/chrome/common/omaha_query_params/omaha_query_params.cc b/chrome/common/omaha_query_params/omaha_query_params.cc
|
| index 6db55d945d0c8c84d2ccfbebf87176df5bda2bc0..04fb7ab904d4c79bcc8e8e3a676cc602bcb357ac 100644
|
| --- a/chrome/common/omaha_query_params/omaha_query_params.cc
|
| +++ b/chrome/common/omaha_query_params/omaha_query_params.cc
|
| @@ -49,22 +49,6 @@ const char kChrome[] = "chrome";
|
| const char kChromeCrx[] = "chromecrx";
|
| const char kChromiumCrx[] = "chromiumcrx";
|
|
|
| -const char* GetProdIdString(chrome::OmahaQueryParams::ProdId prod) {
|
| - switch (prod) {
|
| - case chrome::OmahaQueryParams::CHROME:
|
| - return kChrome;
|
| - break;
|
| - case chrome::OmahaQueryParams::CRX:
|
| -#if defined(GOOGLE_CHROME_BUILD)
|
| - return kChromeCrx;
|
| -#else
|
| - return kChromiumCrx;
|
| -#endif
|
| - break;
|
| - }
|
| - return kUnknown;
|
| -}
|
| -
|
| const char kStable[] = "stable";
|
| const char kBeta[] = "beta";
|
| const char kDev[] = "dev";
|
| @@ -95,6 +79,7 @@ const char* GetChannelString() {
|
|
|
| namespace chrome {
|
|
|
| +// static
|
| std::string OmahaQueryParams::Get(ProdId prod) {
|
| return base::StringPrintf(
|
| "os=%s&arch=%s&nacl_arch=%s&prod=%s&prodchannel=%s&prodversion=%s",
|
| @@ -107,6 +92,24 @@ std::string OmahaQueryParams::Get(ProdId prod) {
|
| }
|
|
|
| // static
|
| +const char* OmahaQueryParams::GetProdIdString(
|
| + chrome::OmahaQueryParams::ProdId prod) {
|
| + switch (prod) {
|
| + case chrome::OmahaQueryParams::CHROME:
|
| + return kChrome;
|
| + break;
|
| + case chrome::OmahaQueryParams::CRX:
|
| +#if defined(GOOGLE_CHROME_BUILD)
|
| + return kChromeCrx;
|
| +#else
|
| + return kChromiumCrx;
|
| +#endif
|
| + break;
|
| + }
|
| + return kUnknown;
|
| +}
|
| +
|
| +// static
|
| const char* OmahaQueryParams::getOS() {
|
| return kOs;
|
| }
|
|
|