diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 07:58:51 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 07:58:51 +0000 |
| commit | bd3bd44953d12d7480f39af550c8259dfab7128a (patch) | |
| tree | 96115926a6ce32f1e18d4d23fbe767cbb6f6e33e | |
| parent | d99231b15054269fba1907dc8ce68208e6ad9751 (diff) | |
| download | chromium_src-bd3bd44953d12d7480f39af550c8259dfab7128a.zip chromium_src-bd3bd44953d12d7480f39af550c8259dfab7128a.tar.gz chromium_src-bd3bd44953d12d7480f39af550c8259dfab7128a.tar.bz2 | |
DevTools: if 'debug_devtools' is defined in .gyp, always try loading from disk, take 2.
Missing variable definition added.
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
BUG=none
TEST=none
TBR=pfeldman@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79528 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/chrome_url_data_manager_backend.cc | 12 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 955ff11..644c9ed 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -385,6 +385,12 @@ # Under development: http://crbug.com/68551 'use_harfbuzz_ng%': 0, + # If debug_devtools is set to 1, JavaScript files for DevTools are + # stored as is and loaded from disk. Otherwise, a concatenated file + # is stored in resources.pak. It is still possible to load JS files + # from disk by passing --debug-devtools cmdline switch. + 'debug_devtools%': 0, + # Point to ICU directory. 'icu_src_dir': '../third_party/icu', 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 12dd299..a5723e5 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 965831f..cd219a6 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3308,6 +3308,11 @@ 'CHROME_V8', ], }], + ['debug_devtools==1', { + 'defines': [ + 'DEBUG_DEVTOOLS=1', + ], + }], ['chromeos==0', { 'sources/': [ ['exclude', '^browser/chromeos'], |