diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 14:50:55 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 14:50:55 +0000 |
| commit | 4e6d3ff51c083f84fe9a6740861aa38deceacb71 (patch) | |
| tree | 89671daec300345a61099c666ff77dc6c3f753b1 /chrome | |
| parent | 03728b04d9bd4d8b9da7e2d04ccea3e6ef1c563d (diff) | |
| download | chromium_src-4e6d3ff51c083f84fe9a6740861aa38deceacb71.zip chromium_src-4e6d3ff51c083f84fe9a6740861aa38deceacb71.tar.gz chromium_src-4e6d3ff51c083f84fe9a6740861aa38deceacb71.tar.bz2 | |
Revert r79398 "DevTools: if 'debug_devtools' is defined in .gyp, always try loading from disk."
Broke update step on most slaves.
TBR=mnaganov@chromium.org
BUG=
TEST=
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/webui/chrome_url_data_manager_backend.cc | 12 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 5 |
2 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc index 1dc9b23..bf7f5e1 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -133,7 +133,6 @@ class URLRequestChromeFileJob : public net::URLRequestFileJob { class DevToolsJobFactory { public: - static bool ShouldLoadFromDisk(); static bool IsSupportedURL(const GURL& url, FilePath* path); static net::URLRequestJob* CreateJobForRequest(net::URLRequest* request, const FilePath& path); @@ -260,7 +259,8 @@ void ChromeURLDataManagerBackend::DataAvailable(RequestID request_id, net::URLRequestJob* ChromeURLDataManagerBackend::Factory( net::URLRequest* request, const std::string& scheme) { - if (DevToolsJobFactory::ShouldLoadFromDisk()) { + + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugDevTools)) { // Try loading chrome-devtools:// files from disk. FilePath path; if (DevToolsJobFactory::IsSupportedURL(request->url(), &path)) @@ -387,14 +387,6 @@ URLRequestChromeFileJob::URLRequestChromeFileJob(net::URLRequest* request, URLRequestChromeFileJob::~URLRequestChromeFileJob() {} -bool DevToolsJobFactory::ShouldLoadFromDisk() { -#if defined(DEBUG_DEVTOOLS) - return true; -#else - return CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugDevTools); -#endif -} - bool DevToolsJobFactory::IsSupportedURL(const GURL& url, FilePath* path) { if (!url.SchemeIs(chrome::kChromeDevToolsScheme)) return false; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index f2d4bc8..136fd8f 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3300,11 +3300,6 @@ 'CHROME_V8', ], }], - ['debug_devtools==1', { - 'defines': [ - 'DEBUG_DEVTOOLS=1', - ], - }], ['chromeos==0', { 'sources/': [ ['exclude', '^browser/chromeos'], |