Fix disappearing page actions bug.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 
 #import <Cocoa/Cocoa.h>
@@ skipping 176 matching lines @@
 
  private:
   friend ZoomDecorationTest;
 
   // Posts |notification| to the default notification center.
   void PostNotification(NSString* notification);
 
   // Return the decoration for |page_action|.
   PageActionDecoration* GetPageActionDecoration(ExtensionAction* page_action);
 
-  // Clear the page-action decorations.
-  void DeletePageActionDecorations();
+  // Clear the page-actions and page-action decorations.
+  void DeletePageActionsAndDecorations();
 
   void OnEditBookmarksEnabledChanged();
 
   // Re-generate the page-action decorations from the profile's
   // extension service.
   void RefreshPageActionDecorations();
 
   // Updates visibility of the content settings icons based on the current
   // tab contents state.
   bool RefreshContentSettingsDecorations();
@@ skipping 30 matching lines @@
   scoped_ptr<StarDecoration> star_decoration_;
 
   // Translate icon at the end of the ominibox.
   scoped_ptr<TranslateDecoration> translate_decoration_;
 
   // A zoom icon at the end of the omnibox, which shows at non-standard zoom
   // levels.
   scoped_ptr<ZoomDecoration> zoom_decoration_;
 
   // The installed page actions.
+  // There should be a 1:1 correspondence between elements of |page_actions_|
+  // and elements of |page_action_decorations_|.
   std::vector<ExtensionAction*> page_actions_;

[danduong, 2014/12/20 03:22:14]

Same comment as the views implementation. We might want to drop this vector
altogether.

[erikchen, 2014/12/22 20:39:43]

Done.

 
   // Decorations for the installed Page Actions.
+  // There should be a 1:1 correspondence between elements of |page_actions_|
+  // and elements of |page_action_decorations_|.
   ScopedVector<PageActionDecoration> page_action_decorations_;
 
   // The content blocked decorations.
   ScopedVector<ContentSettingDecoration> content_setting_decorations_;
 
   // Keyword hint decoration displayed on the right-hand side.
   scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_;
 
   // The voice search icon.
   scoped_ptr<MicSearchDecoration> mic_search_decoration_;
@@ skipping 15 matching lines @@
   // Used to schedule a task for the first run info bubble.
   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
 
   // Used to change the visibility of the star decoration.
   BooleanPrefMember edit_bookmarks_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_