diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 03:56:14 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 03:56:14 +0000 |
commit | 37ae3f2374cf3b18d78ba6d2efa1f4a55bd9bda2 (patch) | |
tree | c94b659c4fc84d23f0a1e86437c22194e32077bb /chrome/browser/memory_details.cc | |
parent | 0c3d29e61872c6dc60a370feddc76a8adb968baa (diff) | |
download | chromium_src-37ae3f2374cf3b18d78ba6d2efa1f4a55bd9bda2.zip chromium_src-37ae3f2374cf3b18d78ba6d2efa1f4a55bd9bda2.tar.gz chromium_src-37ae3f2374cf3b18d78ba6d2efa1f4a55bd9bda2.tar.bz2 |
Nix kAboutSyncInternalsURL.
Nix kAboutSyncURL.
Nix kAboutShorthangURL.
Nix kAboutNetInternalsURL.
Nix kAboutIPCURL.
Nix kAboutHistogramsURL.
Nix kAboutHangURL.
Nix kAboutGpuHangURL.
Nix kAboutGpuCleanURL.
Nix kAboutGpuURL.
Nix kAboutFlashURL.
Nix kAboutFlagsURL.
Nix kAboutDNSURL.
Nix kAboutCreditsURL.
Nix kAboutKillURL.
Nix kAboutConflicts.
Nix kAboutBrowserCrash.
Nix kAboutCacheURL.
Nix kAboutAppCacheInternalsURL.
Nix kAboutAboutURL.
Replace kAboutMemoryURL with kChromeUIMemoryURL.
Replace kAboutTermsURL with kChromeUITermsURL.
Replace kAboutGpuCrashURL with kChromeUIGpuCrashURL.
Unify kChromeUITaskManager* and kChromeUITasks*.
Added TODO: Resolve chrome_frame dependency on kAboutPluginsURL & kAboutVersionURL.
BUG=55771
TEST=Touched about:foo URLs still work.
Review URL: http://codereview.chromium.org/7310020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details.cc')
-rw-r--r-- | chrome/browser/memory_details.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index e8fe40e..8d26788 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -211,14 +211,14 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); // We need to check the pending entry as well as the virtual_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). + // see if it's a chrome://memory URL (we don't want to count these in + // the total memory usage of the browser). // - // When we reach here, about:memory will be the pending entry since we - // haven't responded with any data such that it would be committed. If - // you have another about:memory tab open (which would be committed), - // we don't want to count it either, so we also check the last committed - // entry. + // When we reach here, chrome://memory will be the pending entry since + // we haven't responded with any data such that it would be committed. + // If you have another chrome://memory tab open (which would be + // committed), we don't want to count it either, so we also check the + // last committed entry. // // Either the pending or last committed entries can be NULL. const NavigationEntry* pending_entry = @@ -227,10 +227,10 @@ void MemoryDetails::CollectChildInfoOnUIThread() { contents->controller().GetLastCommittedEntry(); if ((last_committed_entry && LowerCaseEqualsASCII(last_committed_entry->virtual_url().spec(), - chrome::kAboutMemoryURL)) || + chrome::kChromeUIMemoryURL)) || (pending_entry && LowerCaseEqualsASCII(pending_entry->virtual_url().spec(), - chrome::kAboutMemoryURL))) + chrome::kChromeUIMemoryURL))) process.is_diagnostics = true; } } |