Revert 114236 - Options2: Pull the trigger.

chrome/browser/ui/webui/chrome_web_ui_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_factory.cc
===================================================================
--- chrome/browser/ui/webui/chrome_web_ui_factory.cc	(revision 114238)
+++ chrome/browser/ui/webui/chrome_web_ui_factory.cc	(working copy)
@@ -32,7 +32,6 @@
 #include "chrome/browser/ui/webui/net_internals_ui.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
-#include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "chrome/browser/ui/webui/plugins_ui.h"
 #include "chrome/browser/ui/webui/policy_ui.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
@@ -208,8 +207,6 @@
     return &NewWebUI<SessionsUI>;
   if (url.host() == chrome::kChromeUISettingsHost)
     return &NewWebUI<OptionsUI>;
-  if (url.host() == chrome::kChromeUISettingsFrameHost)
-    return &NewWebUI<Options2UI>;
   if (url.host() == chrome::kChromeUISyncInternalsHost)
     return &NewWebUI<SyncInternalsUI>;
   if (url.host() == chrome::kChromeUITaskManagerHost)
@@ -445,9 +442,6 @@
   if (page_url.host() == chrome::kChromeUISettingsHost)
     return OptionsUI::GetFaviconResourceBytes();
 
-  if (page_url.host() == chrome::kChromeUISettingsFrameHost)
-    return Options2UI::GetFaviconResourceBytes();
-
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
Property changes on: chrome/browser/ui/webui/chrome_web_ui_factory.cc
___________________________________________________________________
Deleted: svn:mergeinfo