| Index: chrome/browser/browser_process_impl.cc
|
| ===================================================================
|
| --- chrome/browser/browser_process_impl.cc (revision 116830)
|
| +++ chrome/browser/browser_process_impl.cc (working copy)
|
| @@ -51,7 +51,6 @@
|
| #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/tab_closeable_state_watcher.h"
|
| #include "chrome/browser/tab_contents/thumbnail_generator.h"
|
| @@ -129,7 +128,6 @@
|
| created_profile_manager_(false),
|
| created_local_state_(false),
|
| created_icon_manager_(false),
|
| - created_sidebar_manager_(false),
|
| created_browser_policy_connector_(false),
|
| created_notification_ui_manager_(false),
|
| created_safe_browsing_service_(false),
|
| @@ -442,13 +440,6 @@
|
| return local_state_.get();
|
| }
|
|
|
| -SidebarManager* BrowserProcessImpl::sidebar_manager() {
|
| - DCHECK(CalledOnValidThread());
|
| - if (!created_sidebar_manager_)
|
| - CreateSidebarManager();
|
| - return sidebar_manager_.get();
|
| -}
|
| -
|
| ui::Clipboard* BrowserProcessImpl::clipboard() {
|
| DCHECK(CalledOnValidThread());
|
| return clipboard_.get();
|
| @@ -852,12 +843,6 @@
|
| icon_manager_.reset(new IconManager);
|
| }
|
|
|
| -void BrowserProcessImpl::CreateSidebarManager() {
|
| - DCHECK(sidebar_manager_.get() == NULL);
|
| - created_sidebar_manager_ = true;
|
| - sidebar_manager_ = new SidebarManager();
|
| -}
|
| -
|
| void BrowserProcessImpl::CreateGoogleURLTracker() {
|
| DCHECK(google_url_tracker_.get() == NULL);
|
| scoped_ptr<GoogleURLTracker> google_url_tracker(new GoogleURLTracker);
|
|
|