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

Unified Diff: chrome/browser/dom_ui/dom_ui_contents.cc

Issue 31008: Coalesce more hardcoded schemes to using predefined constants. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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/browsing_instance.cc ('k') | chrome/browser/download/save_package.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/dom_ui_contents.cc
===================================================================
--- chrome/browser/dom_ui/dom_ui_contents.cc (revision 10345)
+++ chrome/browser/dom_ui/dom_ui_contents.cc (working copy)
@@ -12,11 +12,8 @@
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/common/resource_bundle.h"
+#include "chrome/common/url_constants.h"
-// The scheme used for DOMUIContentses
-// TODO(glen): Merge this with the scheme in chrome_url_data_manager
-static const char kURLScheme[] = "chrome-ui";
-
// The path used in internal URLs to thumbnail data.
static const char kThumbnailPath[] = "thumb";
@@ -126,7 +123,8 @@
bool DOMUIContentsCanHandleURL(GURL* url,
TabContentsType* result_type) {
// chrome-internal is a scheme we used to use for the new tab page.
- if (!url->SchemeIs(kURLScheme) && !url->SchemeIs("chrome-internal"))
+ if (!url->SchemeIs(chrome::kChromeUIScheme) &&
+ !url->SchemeIs(chrome::kChromeInternalScheme))
return false;
*result_type = TAB_CONTENTS_DOM_UI;
@@ -225,14 +223,14 @@
// static
const std::string DOMUIContents::GetScheme() {
- return kURLScheme;
+ return chrome::kChromeUIScheme;
}
DOMUI* DOMUIContents::GetDOMUIForURL(const GURL &url) {
#if defined(OS_WIN)
// TODO(port): include this once these are converted to HTML
if (url.host() == NewTabUI::GetBaseURL().host() ||
- url.SchemeIs("chrome-internal")) {
+ url.SchemeIs(chrome::kChromeInternalScheme)) {
return new NewTabUI(this);
} else if (url.host() == HistoryUI::GetBaseURL().host()) {
return new HistoryUI(this);
« no previous file with comments | « chrome/browser/browsing_instance.cc ('k') | chrome/browser/download/save_package.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698