Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1726)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_util.cc

Issue 2890: Include chrome/browser/SConscript in Linux build.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_util.cc
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_util.cc (revision 2262)
+++ chrome/browser/safe_browsing/safe_browsing_util.cc (working copy)
@@ -137,6 +137,11 @@
bool VerifyMAC(const std::string& key, const std::string& mac,
const char* data, int data_length) {
+#if !defined(OS_WIN)
+ // TODO(port): Remove #defines when linking issue with modp_b64 is resolved.
+ NOTIMPLEMENTED();
+ return false;
+#endif
std::string key_copy = key;
DecodeWebSafe(&key_copy);
std::string decoded_key;
@@ -168,6 +173,8 @@
}
}
+#if defined(OS_WIN)
+// TODO(port): remove conditional #ifs when google_util is ported
GURL GeneratePhishingReportUrl(const std::string& report_page,
const std::string& url_to_report) {
Locale locale = Locale::getDefault();
@@ -183,6 +190,7 @@
current_esc.c_str()));
return google_util::AppendGoogleLocaleParam(report_url);
}
+#endif
} // namespace safe_browsing_util
@@ -476,7 +484,6 @@
data.reset(new char[entry->Size()]);
new_sub_entry = reinterpret_cast<SBEntry*>(data.get());
memcpy(new_sub_entry, entry, entry->Size());
- int new_prefix_count = 0;
// Remove any matching prefixes.
for (int i = 0; i < new_sub_entry->prefix_count(); ++i) {
if (new_sub_entry->ChunkIdAtPrefix(i) == chunk_id)
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698