chrome/browser/browser_about_handler.cc - Issue 3777005: Rename about:labs to about:flags, part 3/3

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 3777005: Rename about:labs to about:flags, part 3/3 (Closed)

Patch Set: comments Created 10 years, 2 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 be8317a2a56bdc135d00858815032f7ba002c934..a93dd91c2746013e6995896f3966ff0272feaff6 100644

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

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

@@ -24,6 +24,7 @@

#include "base/thread.h"

#include "base/tracked_objects.h"

#include "base/utf_string_conversions.h"

+#include "chrome/browser/about_flags.h"

#include "chrome/browser/browser.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_thread.h"

@@ -31,7 +32,6 @@

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

#include "chrome/browser/gpu_process_host.h"

#include "chrome/browser/gpu_process_host_ui_shim.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"

@@ -259,7 +259,7 @@ 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] == kFlagsPath && !about_labs::IsEnabled())

+ if (kAllAboutPaths[i] == kFlagsPath && !about_flags::IsEnabled())

continue;

if (kAllAboutPaths[i] == kAppCacheInternalsPath ||

kAllAboutPaths[i] == kBlobInternalsPath ||

@@ -1178,8 +1178,8 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) {

return true;

}

- if (about_labs::IsEnabled()) {

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

+ if (about_flags::IsEnabled()) {

+ // Rewrite about:flags and about:vaporware to chrome://flags/.

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

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

*url = GURL(chrome::kChromeUIFlagsURL);

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