| 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/safe_browsing/protocol_manager_helper.h" | 5 #include "chrome/browser/safe_browsing/protocol_manager_helper.h" |
| 6 | 6 |
| 7 #ifndef NDEBUG | 7 #ifndef NDEBUG |
| 8 #include "base/base64.h" | 8 #include "base/base64.h" |
| 9 #endif | 9 #endif |
| 10 #include "base/environment.h" | 10 #include "base/environment.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
| 13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 15 #include "chrome/common/chrome_version_info.h" | 15 #include "chrome/common/chrome_version_info.h" |
| 16 #include "chrome/common/env_vars.h" | 16 #include "chrome/common/env_vars.h" |
| 17 #include "google_apis/google_api_keys.h" | 17 #include "google_apis/google_api_keys.h" |
| 18 #include "net/base/escape.h" | 18 #include "net/base/escape.h" |
| 19 | 19 |
| 20 SafeBrowsingProtocolConfig::SafeBrowsingProtocolConfig() | 20 SafeBrowsingProtocolConfig::SafeBrowsingProtocolConfig() |
| 21 : disable_auto_update(false) { | 21 : disable_auto_update(false) |
| 22 #if defined(OS_ANDROID) |
| 23 , disable_connection_check(false) |
| 24 #endif |
| 25 { |
| 22 } | 26 } |
| 23 | 27 |
| 24 SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() { | 28 SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() { |
| 25 } | 29 } |
| 26 | 30 |
| 27 // static | 31 // static |
| 28 std::string SafeBrowsingProtocolManagerHelper::Version() { | 32 std::string SafeBrowsingProtocolManagerHelper::Version() { |
| 29 chrome::VersionInfo version_info; | 33 chrome::VersionInfo version_info; |
| 30 if (!version_info.is_valid() || version_info.Version().empty()) | 34 if (!version_info.is_valid() || version_info.Version().empty()) |
| 31 return "0.1"; | 35 return "0.1"; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 48 base::StringAppendF(&url, "&key=%s", | 52 base::StringAppendF(&url, "&key=%s", |
| 49 net::EscapeQueryParamValue(api_key, true).c_str()); | 53 net::EscapeQueryParamValue(api_key, true).c_str()); |
| 50 } | 54 } |
| 51 if (!additional_query.empty()) { | 55 if (!additional_query.empty()) { |
| 52 DCHECK(url.find("?") != std::string::npos); | 56 DCHECK(url.find("?") != std::string::npos); |
| 53 url.append("&"); | 57 url.append("&"); |
| 54 url.append(additional_query); | 58 url.append(additional_query); |
| 55 } | 59 } |
| 56 return url; | 60 return url; |
| 57 } | 61 } |
| OLD | NEW |