| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| index b1505f6b5a22bb6a996e499359b2dde97dda3a25..30322416086b469fa5847e2d016d69c98f7e17e9 100644
|
| --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
|
| @@ -13,7 +13,6 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "base/prefs/public/pref_observer.h"
|
| #include "chrome/browser/api/prefs/pref_member.h"
|
| #include "chrome/browser/extensions/image_loading_tracker.h"
|
| #include "chrome/browser/ui/browser.h"
|
| @@ -46,8 +45,7 @@ class ZoomDecoration;
|
| class LocationBarViewMac : public LocationBar,
|
| public LocationBarTesting,
|
| public OmniboxEditController,
|
| - public content::NotificationObserver,
|
| - public PrefObserver {
|
| + public content::NotificationObserver {
|
| public:
|
| LocationBarViewMac(AutocompleteTextField* field,
|
| CommandUpdater* command_updater,
|
| @@ -180,10 +178,6 @@ class LocationBarViewMac : public LocationBar,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| - // PrefObserver:
|
| - virtual void OnPreferenceChanged(PrefServiceBase* service,
|
| - const std::string& pref_name) OVERRIDE;
|
| -
|
| Browser* browser() const { return browser_; }
|
|
|
| private:
|
| @@ -196,6 +190,8 @@ class LocationBarViewMac : public LocationBar,
|
| // Clear the page-action decorations.
|
| void DeletePageActionDecorations();
|
|
|
| + void OnEditBookmarksEnabledChanged();
|
| +
|
| // Re-generate the page-action decorations from the profile's
|
| // extension service.
|
| void RefreshPageActionDecorations();
|
|
|