Revert 114236 - Options2: Pull the trigger.

chrome/common/url_constants.cc

Index: chrome/common/url_constants.cc
===================================================================
--- chrome/common/url_constants.cc	(revision 114238)
+++ chrome/common/url_constants.cc	(working copy)
@@ -64,9 +64,6 @@
 const char kChromeUIPrintURL[] = "chrome://print/";
 const char kChromeUISessionsURL[] = "chrome://sessions/";
 const char kChromeUISettingsURL[] = "chrome://settings/";
-// settings-frame is the URL used to directly access the new settings page in
-// the UberPage, AKA options2.
-const char kChromeUISettingsFrameURL[] = "chrome://settings-frame/";
 const char kChromeUIShorthangURL[] = "chrome://shorthang/";
 const char kChromeUISSLClientCertificateSelectorURL[] = "chrome://select-cert/";
 const char kChromeUISyncPromoURL[] = "chrome://syncpromo/";
@@ -170,7 +167,6 @@
 const char kChromeUIResourcesHost[] = "resources";
 const char kChromeUISessionsHost[] = "sessions";
 const char kChromeUISettingsHost[] = "settings";
-const char kChromeUISettingsFrameHost[] = "settings-frame";
 const char kChromeUIShorthangHost[] = "shorthang";
 const char kChromeUISSLClientCertificateSelectorHost[] = "select-cert";
 const char kChromeUIStatsHost[] = "stats";