| 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 c1e37ef14d4be0268f403cd365368bde687b95f5..f3b8949c9665cd9f1c7e45e0ca9b5e075a420027 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| @@ -981,13 +981,8 @@ void LocationBarView::Update(const WebContents* contents) {
|
| GetToolbarModel()->input_in_progress() ? NULL : GetWebContents();
|
| open_pdf_in_reader_view_->Update(web_contents_for_sub_views);
|
|
|
| - if (star_view_) {
|
| - star_view_->SetVisible(
|
| - browser_defaults::bookmarks_enabled && !is_popup_mode_ &&
|
| - !GetToolbarModel()->input_in_progress() &&
|
| - edit_bookmarks_enabled_.GetValue() &&
|
| - !IsBookmarkStarHiddenByExtension());
|
| - }
|
| + if (star_view_)
|
| + UpdateBookmarkStarVisibility();
|
|
|
| if (contents)
|
| omnibox_view_->OnTabChanged(contents);
|
| @@ -1300,6 +1295,16 @@ void LocationBarView::InvalidatePageActions() {
|
| DeletePageActionViews();
|
| }
|
|
|
| +void LocationBarView::UpdateBookmarkStarVisibility() {
|
| + if (star_view_) {
|
| + star_view_->SetVisible(
|
| + browser_defaults::bookmarks_enabled && !is_popup_mode_ &&
|
| + !GetToolbarModel()->input_in_progress() &&
|
| + edit_bookmarks_enabled_.GetValue() &&
|
| + !IsBookmarkStarHiddenByExtension());
|
| + }
|
| +}
|
| +
|
| bool LocationBarView::ShowPageActionPopup(
|
| const extensions::Extension* extension,
|
| bool grant_tab_permissions) {
|
|
|