chrome/browser/browser_about_handler.cc - Issue 3256001: Revert 57635: Implement about:labs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/browser_about_handler.cc

Issue 3256001: Revert 57635: Implement about:labs (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 4 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

Index: chrome/browser/browser_about_handler.cc

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc

index 4599689063944c36360a69fc4ddfafeb294944b2..25e288d45669a75f7bcfe7fcfe9e1bf1519d5145 100644

--- a/chrome/browser/browser_about_handler.cc

+++ b/chrome/browser/browser_about_handler.cc

@@ -29,7 +29,6 @@

#include "chrome/browser/chrome_thread.h"

#include "chrome/browser/defaults.h"

#include "chrome/browser/dom_ui/chrome_url_data_manager.h"

-#include "chrome/browser/labs.h"

#include "chrome/browser/memory_details.h"

#include "chrome/browser/metrics/histogram_synchronizer.h"

#include "chrome/browser/net/predictor_api.h"

@@ -97,7 +96,6 @@ const char kCreditsPath[] = "credits";

const char kCachePath[] = "view-http-cache";

const char kDnsPath[] = "dns";

const char kHistogramsPath[] = "histograms";

-const char kLabsPath[] = "labs";

const char kMemoryRedirectPath[] = "memory-redirect";

const char kMemoryPath[] = "memory";

const char kStatsPath[] = "stats";

@@ -129,7 +127,6 @@ const char *kAllAboutPaths[] = {

kCreditsPath,

kDnsPath,

kHistogramsPath,

- kLabsPath,

kMemoryPath,

kNetInternalsPath,

kPluginsPath,

@@ -253,17 +250,13 @@ std::string AboutAbout() {

html.append("<html><head><title>About Pages</title></head><body>\n");

html.append("<h2>List of About pages</h2><ul>\n");

for (size_t i = 0; i < arraysize(kAllAboutPaths); i++) {

- if (kAllAboutPaths[i] == kLabsPath && !about_labs::IsEnabled())

- continue;

- if (kAllAboutPaths[i] == kAppCacheInternalsPath ||

+ if (kAllAboutPaths[i] == kNetInternalsPath ||

+ kAllAboutPaths[i] == kPluginsPath ||

kAllAboutPaths[i] == kCachePath ||

- kAllAboutPaths[i] == kLabsPath ||

- kAllAboutPaths[i] == kNetInternalsPath ||

- kAllAboutPaths[i] == kPluginsPath) {

+ kAllAboutPaths[i] == kAppCacheInternalsPath)

html.append("<li><a href='chrome://");

- } else {

+ else

html.append("<li><a href='chrome://about/");

- }

html.append(kAllAboutPaths[i]);

html.append("/'>about:");

html.append(kAllAboutPaths[i]);

@@ -1132,15 +1125,6 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) {

return true;

}

- if (about_labs::IsEnabled()) {

- // Rewrite about:labs and about:vaporware to chrome://labs/.

- if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutLabsURL) ||

- LowerCaseEqualsASCII(url->spec(), chrome::kAboutVaporwareURL)) {

- *url = GURL(chrome::kChromeUILabsURL);

- return true;

- }

// Rewrite about:net-internals/* URLs to chrome://net-internals/*

if (StartsWithAboutSpecifier(*url, chrome::kAboutNetInternalsURL)) {

*url = RemapAboutURL(chrome::kNetworkViewInternalsURL, *url);

« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »