| Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| index 3bdc14d7413d3b5e576eada4f2f126e5ec22e665..9f16caebc34510b5ffade45547aca33ba06ee264 100644
|
| --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h
|
| @@ -8,7 +8,6 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/prefs/public/pref_change_registrar.h"
|
| -#include "base/prefs/public/pref_observer.h"
|
| #include "chrome/browser/ui/tabs/hover_tab_selector.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/ui/views/tabs/tab_strip_controller.h"
|
| @@ -27,8 +26,7 @@ class WebContents;
|
| // An implementation of TabStripController that sources data from the
|
| // TabContentses in a TabStripModel.
|
| class BrowserTabStripController : public TabStripController,
|
| - public TabStripModelObserver,
|
| - public PrefObserver {
|
| + public TabStripModelObserver {
|
| public:
|
| BrowserTabStripController(Browser* browser, TabStripModel* model);
|
| virtual ~BrowserTabStripController();
|
| @@ -96,10 +94,6 @@ class BrowserTabStripController : public TabStripController,
|
| virtual void TabBlockedStateChanged(content::WebContents* contents,
|
| int model_index) OVERRIDE;
|
|
|
| - // PrefObserver implementation:
|
| - virtual void OnPreferenceChanged(PrefServiceBase* service,
|
| - const std::string& pref_name) OVERRIDE;
|
| -
|
| protected:
|
| // The context in which SetTabRendererDataFromModel is being called.
|
| enum TabStatus {
|
|
|