diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 14:46:35 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 14:46:35 +0000 |
| commit | 03728b04d9bd4d8b9da7e2d04ccea3e6ef1c563d (patch) | |
| tree | 3188f35d781a96853677776147b2672e8062341d | |
| parent | 16a3549ea2518117da7e41b422ab2a3930f33245 (diff) | |
| download | chromium_src-03728b04d9bd4d8b9da7e2d04ccea3e6ef1c563d.zip chromium_src-03728b04d9bd4d8b9da7e2d04ccea3e6ef1c563d.tar.gz chromium_src-03728b04d9bd4d8b9da7e2d04ccea3e6ef1c563d.tar.bz2 | |
DevTools: if 'debug_devtools' is defined in .gyp, always try loading from disk.
We have found that being forced to pass '--debug-devtools' isn't
convenient for DevTools developers, and decided to always load DevTools
files from disk, if Chromium was compiled with 'debug_devtools' flag set
in .gyp
R=pfeldman@chromium.org,tony@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6730057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79398 0039d316-1c4b-4281-b951-d872f2087c98
| -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, 15 insertions, 2 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 bf7f5e1..1dc9b23 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc @@ -133,6 +133,7 @@ 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); @@ -259,8 +260,7 @@ void ChromeURLDataManagerBackend::DataAvailable(RequestID request_id, net::URLRequestJob* ChromeURLDataManagerBackend::Factory( net::URLRequest* request, const std::string& scheme) { - - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugDevTools)) { + if (DevToolsJobFactory::ShouldLoadFromDisk()) { // Try loading chrome-devtools:// files from disk. FilePath path; if (DevToolsJobFactory::IsSupportedURL(request->url(), &path)) @@ -387,6 +387,14 @@ 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 136fd8f..f2d4bc8 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3300,6 +3300,11 @@ 'CHROME_V8', ], }], + ['debug_devtools==1', { + 'defines': [ + 'DEBUG_DEVTOOLS=1', + ], + }], ['chromeos==0', { 'sources/': [ ['exclude', '^browser/chromeos'], |