summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_about_handler.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 01:22:18 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 01:22:18 +0000
commit8bf104801369f43387e7538b5ed208f352e3b26b (patch)
tree7f67c8c956f9bf291a12732062d3d356d8fce34b /chrome/browser/browser_about_handler.cc
parent4cf2c47ec98b7203686672d872b6e6df5c1319bf (diff)
downloadchromium_src-8bf104801369f43387e7538b5ed208f352e3b26b.zip
chromium_src-8bf104801369f43387e7538b5ed208f352e3b26b.tar.gz
chromium_src-8bf104801369f43387e7538b5ed208f352e3b26b.tar.bz2
Move handling of debug urls like chrome://crash, chrome://gpuclean to content. These are for testing the content layer, so they belong there. This allows us to hide GpuProcessHostUIShim from chrome.
I cleaned up the about_handler.* files which were overly complicated. I also was able to remove a method from ContentBrowserClient. BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9349010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
-rw-r--r--chrome/browser/browser_about_handler.cc33
1 files changed, 0 insertions, 33 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 7212cb6..0c7b22b 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -12,10 +12,8 @@
#include "base/string_util.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/ui/browser_dialogs.h"
-#include "chrome/common/about_handler.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
-#include "content/browser/gpu/gpu_process_host_ui_shim.h"
#include "content/browser/sensors/sensors_provider.h"
#if defined(USE_TCMALLOC)
@@ -104,10 +102,6 @@ bool WillHandleBrowserAboutURL(GURL* url,
if (!url->SchemeIs(chrome::kChromeUIScheme))
return false;
- // Circumvent processing URLs that the renderer process will handle.
- if (chrome_about_handler::WillHandle(*url))
- return false;
-
CommandLine* cl = CommandLine::ForCurrentProcess();
bool enableUberPage = !cl->HasSwitch(switches::kDisableUberPage);
@@ -172,33 +166,6 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
#endif // OFFICIAL_BUILD
- // Handle URLs to crash the browser or wreck the gpu process.
- if (host == chrome::kChromeUIBrowserCrashHost) {
- // Induce an intentional crash in the browser process.
- CHECK(false);
- }
-
- if (host == chrome::kChromeUIGpuCleanHost) {
- GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
- if (shim)
- shim->SimulateRemoveAllContext();
- return true;
- }
-
- if (host == chrome::kChromeUIGpuCrashHost) {
- GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
- if (shim)
- shim->SimulateCrash();
- return true;
- }
-
- if (host == chrome::kChromeUIGpuHangHost) {
- GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
- if (shim)
- shim->SimulateHang();
- return true;
- }
-
#if defined(OS_CHROMEOS)
if (host == chrome::kChromeUIRotateHost) {
content::ScreenOrientation change = content::SCREEN_ORIENTATION_TOP;