Fix disappearing page actions bug.

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

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 73b809db8abb6a64ca558794a47032a5a8529dcd..90913be199cd348637657330bd0516c149f8835d 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
@@ -194,8 +194,8 @@ class LocationBarViewMac : public LocationBar,
   // 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();
 
@@ -246,9 +246,13 @@ class LocationBarViewMac : public LocationBar,
   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.