Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 2458573004: Move debug_devtools to a buildflag_header. (Closed)
Patch Set: Merge Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index a5e0d6c230647f8dbb4de909abb458cb898434a5..6ddcc766f5b2e3f315dd906fc8e50d38d8e8e0c1 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -110,6 +110,7 @@
#include "net/url_request/url_request_intercepting_job_factory.h"
#include "net/url_request/url_request_interceptor.h"
#include "net/url_request/url_request_job_factory_impl.h"
+#include "third_party/WebKit/public/public_features.h"
#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_cookie_monster_delegate.h"
@@ -178,7 +179,7 @@ namespace {
net::CertVerifier* g_cert_verifier_for_testing = nullptr;
-#if defined(DEBUG_DEVTOOLS)
+#if BUILDFLAG(DEBUG_DEVTOOLS)
bool IsSupportedDevToolsURL(const GURL& url, base::FilePath* path) {
std::string bundled_path_prefix(chrome::kChromeUIDevToolsBundledPath);
bundled_path_prefix = "/" + bundled_path_prefix + "/";
@@ -244,7 +245,7 @@ class DebugDevToolsInterceptor : public net::URLRequestInterceptor {
return NULL;
}
};
-#endif // defined(DEBUG_DEVTOOLS)
+#endif // BUILDFLAG(DEBUG_DEVTOOLS)
#if defined(OS_CHROMEOS)
// The following four functions are responsible for initializing NSS for each
@@ -1232,7 +1233,7 @@ ProfileIOData::SetUpJobFactoryDefaults(
url::kFtpScheme, net::FtpProtocolHandler::Create(host_resolver));
#endif // !BUILDFLAG(DISABLE_FTP_SUPPORT)
-#if defined(DEBUG_DEVTOOLS)
+#if BUILDFLAG(DEBUG_DEVTOOLS)
request_interceptors.push_back(new DebugDevToolsInterceptor);
#endif
« no previous file with comments | « chrome/browser/devtools/remote_debugging_server.cc ('k') | chrome/browser/renderer_context_menu/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698