Index: chrome/browser/browser_process_impl.cc |
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc |
index 863c96a8c4e25b5ebef6c627001b884590d47815..dff67ecbdcccae794bfbbdb4109028fc94cc80fc 100644 |
--- a/chrome/browser/browser_process_impl.cc |
+++ b/chrome/browser/browser_process_impl.cc |
@@ -59,6 +59,7 @@ |
#include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h" |
#include "chrome/browser/safe_browsing/safe_browsing_service.h" |
#include "chrome/browser/shell_integration.h" |
+#include "chrome/browser/sidebar/sidebar_manager.h" |
#include "chrome/browser/status_icons/status_tray.h" |
#include "chrome/browser/ui/browser_dialogs.h" |
#include "chrome/browser/ui/browser_finder.h" |
@@ -174,6 +175,7 @@ BrowserProcessImpl::BrowserProcessImpl( |
created_profile_manager_(false), |
created_local_state_(false), |
created_icon_manager_(false), |
+ created_sidebar_manager_(false), |
created_notification_ui_manager_(false), |
created_safe_browsing_service_(false), |
module_ref_count_(0), |
@@ -567,6 +569,13 @@ PrefService* BrowserProcessImpl::local_state() { |
return local_state_.get(); |
} |
+SidebarManager* BrowserProcessImpl::sidebar_manager() { |
+ DCHECK(CalledOnValidThread()); |
+ if (!created_sidebar_manager_) |
+ CreateSidebarManager(); |
+ return sidebar_manager_.get(); |
+} |
+ |
net::URLRequestContextGetter* BrowserProcessImpl::system_request_context() { |
DCHECK(CalledOnValidThread()); |
return io_thread()->system_url_request_context_getter(); |
@@ -1075,6 +1084,12 @@ void BrowserProcessImpl::CreateIconManager() { |
icon_manager_.reset(new IconManager); |
} |
+void BrowserProcessImpl::CreateSidebarManager() { |
+ DCHECK(!created_sidebar_manager_ && sidebar_manager_.get() == NULL); |
+ created_sidebar_manager_ = true; |
+ sidebar_manager_ = new SidebarManager(); |
+} |
+ |
void BrowserProcessImpl::CreateIntranetRedirectDetector() { |
DCHECK(intranet_redirect_detector_.get() == NULL); |
scoped_ptr<IntranetRedirectDetector> intranet_redirect_detector( |