Merge 99883 - Completely disable about:flags

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 99885)
+++ chrome/browser/ui/webui/chrome_web_ui_factory.cc	(working copy)
@@ -170,8 +170,9 @@
     return &NewWebUI<HistoryUI>;
   if (url.host() == chrome::kChromeUIHistory2Host)
     return &NewWebUI<HistoryUI2>;
-  if (url.host() == chrome::kChromeUIFlagsHost)
-    return &NewWebUI<FlagsUI>;
+  // TODO(thakis): Reenable.
+  //if (url.host() == chrome::kChromeUIFlagsHost)
+  //  return &NewWebUI<FlagsUI>;
   if (url.host() == chrome::kChromeUIFlashHost)
     return &NewWebUI<FlashUI>;
 #if defined(TOUCH_UI)
@@ -376,8 +377,9 @@
   if (page_url.host() == chrome::kChromeUIHistory2Host)
     return HistoryUI2::GetFaviconResourceBytes();
 
-  if (page_url.host() == chrome::kChromeUIFlagsHost)
-    return FlagsUI::GetFaviconResourceBytes();
+  // TODO(thakis): Reenable.
+  //if (page_url.host() == chrome::kChromeUIFlagsHost)
+  //  return FlagsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISessionsHost)
     return SessionsUI::GetFaviconResourceBytes();