Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/updater/manifest_fetch_data.h" | 5 #include "chrome/browser/extensions/updater/manifest_fetch_data.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "chrome/browser/google/google_util.h" | 13 #include "chrome/browser/google/google_util.h" |
| 14 #include "chrome/browser/metrics/metrics_service.h" | 14 #include "chrome/browser/metrics/metrics_service.h" |
| 15 #include "chrome/common/omaha_query_params.h" | |
| 15 #include "net/base/escape.h" | 16 #include "net/base/escape.h" |
| 16 | 17 |
| 17 namespace { | 18 namespace { |
| 18 | 19 |
| 19 // Maximum length of an extension manifest update check url, since it is a GET | 20 // Maximum length of an extension manifest update check url, since it is a GET |
| 20 // request. We want to stay under 2K because of proxies, etc. | 21 // request. We want to stay under 2K because of proxies, etc. |
| 21 const int kExtensionsManifestMaxURLSize = 2000; | 22 const int kExtensionsManifestMaxURLSize = 2000; |
| 22 | 23 |
| 23 } // namespace | 24 } // namespace |
| 24 | 25 |
| 25 namespace extensions { | 26 namespace extensions { |
| 26 | 27 |
| 27 ManifestFetchData::ManifestFetchData(const GURL& update_url, int request_id) | 28 ManifestFetchData::ManifestFetchData(const GURL& update_url, int request_id) |
| 28 : base_url_(update_url), | 29 : base_url_(update_url), |
| 29 full_url_(update_url) { | 30 full_url_(update_url) { |
| 31 chrome::OmahaQueryParams::ProdId prod = | |
| 32 #if defined(GOOGLE_CHROME_BUILD) | |
| 33 chrome::OmahaQueryParams::CHROMECRX; | |
| 34 #else | |
| 35 chrome::OmahaQueryParams::CHROMIUMCRX; | |
| 36 #endif | |
| 37 full_url_ = GURL(full_url_.possibly_invalid_spec() + | |
|
sky
2013/03/07 01:25:33
Shouldn't you be using the gurl methods for buildi
jackhou1
2013/03/07 04:19:24
I couldn't find an easy way to add a list of param
| |
| 38 (full_url_.has_query() ? "&" : "?") + | |
| 39 chrome::OmahaQueryParams::Get(prod)); | |
| 30 request_ids_.insert(request_id); | 40 request_ids_.insert(request_id); |
| 31 } | 41 } |
| 32 | 42 |
| 33 ManifestFetchData::~ManifestFetchData() {} | 43 ManifestFetchData::~ManifestFetchData() {} |
| 34 | 44 |
| 35 // The format for request parameters in update checks is: | 45 // The format for request parameters in update checks is: |
| 36 // | 46 // |
| 37 // ?x=EXT1_INFO&x=EXT2_INFO | 47 // ?x=EXT1_INFO&x=EXT2_INFO |
| 38 // | 48 // |
| 39 // where EXT1_INFO and EXT2_INFO are url-encoded strings of the form: | 49 // where EXT1_INFO and EXT2_INFO are url-encoded strings of the form: |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 146 NOTREACHED(); | 156 NOTREACHED(); |
| 147 return value == kNeverPinged || value > 0; | 157 return value == kNeverPinged || value > 0; |
| 148 } | 158 } |
| 149 | 159 |
| 150 void ManifestFetchData::Merge(const ManifestFetchData& other) { | 160 void ManifestFetchData::Merge(const ManifestFetchData& other) { |
| 151 DCHECK(full_url() == other.full_url()); | 161 DCHECK(full_url() == other.full_url()); |
| 152 request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end()); | 162 request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end()); |
| 153 } | 163 } |
| 154 | 164 |
| 155 } // namespace extensions | 165 } // namespace extensions |
| OLD | NEW |