| Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| index 4e150ccde6c56f428064defc9bb6907e458c7335..3a3c56242912321467630f46248f638eaa92c0f5 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| @@ -202,8 +202,12 @@ LocationBarView::LocationBarView(Browser* browser,
|
| true));
|
| }
|
|
|
| - edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled,
|
| - profile_->GetPrefs(), this);
|
| + edit_bookmarks_enabled_.Init(
|
| + prefs::kEditBookmarksEnabled,
|
| + profile_->GetPrefs(),
|
| + base::Bind(&LocationBarView::Update,
|
| + base::Unretained(this),
|
| + static_cast<content::WebContents*>(NULL)));
|
| }
|
|
|
| LocationBarView::~LocationBarView() {
|
| @@ -1511,12 +1515,6 @@ void LocationBarView::Observe(int type,
|
| }
|
| }
|
|
|
| -void LocationBarView::OnPreferenceChanged(PrefServiceBase* service,
|
| - const std::string& pref_name) {
|
| - if (pref_name == prefs::kEditBookmarksEnabled)
|
| - Update(NULL);
|
| -}
|
| -
|
| int LocationBarView::GetInternalHeight(bool use_preferred_size) {
|
| int total_height =
|
| use_preferred_size ? GetPreferredSize().height() : height();
|
|
|