| Index: chrome/browser/browser_process_impl.h
|
| diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
|
| index 5a19629ad5083333fec84b808dac3b104c64fdb5..d059cc748ea724eec7d16cf34286936cbd9e7da9 100644
|
| --- a/chrome/browser/browser_process_impl.h
|
| +++ b/chrome/browser/browser_process_impl.h
|
| @@ -15,9 +15,9 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/message_loop.h"
|
| +#include "base/scoped_ptr.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "base/timer.h"
|
| -#include "base/scoped_ptr.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/download/download_status_updater.h"
|
| #include "chrome/browser/prefs/pref_change_registrar.h"
|
| @@ -62,8 +62,7 @@ class BrowserProcessImpl : public BrowserProcess,
|
| virtual SidebarManager* sidebar_manager();
|
| virtual ui::Clipboard* clipboard();
|
| virtual NotificationUIManager* notification_ui_manager();
|
| - virtual policy::ConfigurationPolicyProviderKeeper*
|
| - configuration_policy_provider_keeper();
|
| + virtual policy::BrowserPolicyContext* browser_policy_context();
|
| virtual IconManager* icon_manager();
|
| virtual ThumbnailGenerator* GetThumbnailGenerator();
|
| virtual AutomationProviderList* InitAutomationProviderList();
|
| @@ -185,9 +184,8 @@ class BrowserProcessImpl : public BrowserProcess,
|
| bool created_sidebar_manager_;
|
| scoped_refptr<SidebarManager> sidebar_manager_;
|
|
|
| - bool created_configuration_policy_provider_keeper_;
|
| - scoped_ptr<policy::ConfigurationPolicyProviderKeeper>
|
| - configuration_policy_provider_keeper_;
|
| + bool created_browser_policy_context_;
|
| + scoped_ptr<policy::BrowserPolicyContext> browser_policy_context_;
|
|
|
| scoped_refptr<printing::PrintPreviewTabController>
|
| print_preview_tab_controller_;
|
|
|