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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 9696049: Add enable_automation build switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 months 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
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/renderer_host/chrome_render_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 0fb1a30de2b2b55cf356ebe820dc09e35a24df4f..b1e0199a8f2ad5a14e4d693c31215d1079859700 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -160,6 +160,7 @@ BrowserProcessImpl::~BrowserProcessImpl() {
}
void BrowserProcessImpl::StartTearDown() {
+#if defined(ENABLE_AUTOMATION)
// Delete the AutomationProviderList before NotificationService,
// since it may try to unregister notifications
// Both NotificationService and AutomationProvider are singleton instances in
@@ -168,6 +169,7 @@ void BrowserProcessImpl::StartTearDown() {
// NotificationService. NotificationService won't be destroyed until after
// this destructor is run.
automation_provider_list_.reset();
+#endif
// We need to shutdown the SdchDictionaryFetcher as it regularly holds
// a pointer to a URLFetcher, and that URLFetcher (upon destruction) will do
@@ -435,9 +437,13 @@ ThumbnailGenerator* BrowserProcessImpl::GetThumbnailGenerator() {
AutomationProviderList* BrowserProcessImpl::GetAutomationProviderList() {
DCHECK(CalledOnValidThread());
+#if defined(ENABLE_AUTOMATION)
if (automation_provider_list_.get() == NULL)
automation_provider_list_.reset(new AutomationProviderList());
return automation_provider_list_.get();
+#else
+ return NULL;
+#endif
}
void BrowserProcessImpl::InitDevToolsHttpProtocolHandler(
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/renderer_host/chrome_render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698