summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 22:24:50 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 22:24:50 +0000
commit6df4074a8f9ab6039c7cb8807b61b52599d14040 (patch)
tree12cfef7094b77c34f5d0590e5e8546b6be5fcc93 /chrome
parentc1f844dd22d6d2ca74e2d576070f66928737d5cd (diff)
downloadchromium_src-6df4074a8f9ab6039c7cb8807b61b52599d14040.zip
chromium_src-6df4074a8f9ab6039c7cb8807b61b52599d14040.tar.gz
chromium_src-6df4074a8f9ab6039c7cb8807b61b52599d14040.tar.bz2
Fix a bunch of tiny near-bugs and bugs that static analysis identified
r=mbelshe,brettw Review URL: http://codereview.chromium.org/50014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/memory_details.cc6
-rw-r--r--chrome/browser/net/dns_host_info.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index dfae8a2..aab92f0 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -219,7 +219,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
title = L"Untitled";
process.titles.push_back(title);
- // We need to check the pending entry as well as the pending entry to
+ // We need to check the pending entry as well as the display_url to
// see if it's an about:memory URL (we don't want to count these in the
// total memory usage of the browser).
//
@@ -230,8 +230,8 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
// entry.
//
// Either the pending or last committed entries can be NULL.
- const NavigationEntry* pending_entry = NULL;
- //contents->controller()->GetPendingEntry();
+ const NavigationEntry* pending_entry =
+ contents->controller()->GetPendingEntry();
const NavigationEntry* last_committed_entry =
contents->controller()->GetLastCommittedEntry();
if ((last_committed_entry &&
diff --git a/chrome/browser/net/dns_host_info.h b/chrome/browser/net/dns_host_info.h
index 64681056..5ffca75 100644
--- a/chrome/browser/net/dns_host_info.h
+++ b/chrome/browser/net/dns_host_info.h
@@ -78,6 +78,7 @@ class DnsHostInfo {
queue_duration_(kNullDuration),
benefits_remaining_(),
sequence_number_(0),
+ motivation_(NO_PREFETCH_MOTIVATION),
was_linked_(false) {
}