| Index: chrome/browser/ui/views/location_bar/location_bar_view.h
|
| diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| index da800af0e5a93dfaab5cda36a7611ad7831e4185..da2f076badeefa262597947b1ca8f8d8daf5a078 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
|
| @@ -9,7 +9,6 @@
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "base/prefs/public/pref_observer.h"
|
| #include "chrome/browser/api/prefs/pref_member.h"
|
| #include "chrome/browser/extensions/extension_context_menu_model.h"
|
| #include "chrome/browser/search_engines/template_url_service_observer.h"
|
| @@ -71,8 +70,7 @@ class LocationBarView : public LocationBar,
|
| public OmniboxEditController,
|
| public DropdownBarHostDelegate,
|
| public TemplateURLServiceObserver,
|
| - public content::NotificationObserver,
|
| - public PrefObserver {
|
| + public content::NotificationObserver {
|
| public:
|
| // The location bar view's class name.
|
| static const char kViewClassName[];
|
| @@ -321,10 +319,6 @@ class LocationBarView : public LocationBar,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| - // Overridden from PrefObserver
|
| - virtual void OnPreferenceChanged(PrefServiceBase* service,
|
| - const std::string& pref_name) OVERRIDE;
|
| -
|
| // Returns the height of the control without the top and bottom
|
| // edges(i.e. the height of the edit control inside). If
|
| // |use_preferred_size| is true this will be the preferred height,
|
|
|