Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/extensions/extension_action.h

Index: chrome/browser/extensions/extension_action.h
diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h
index 999102fee2e82b8bea9b8a3100bfbc2861c1d6eb..93646af42e00399419660b5536aa0e7b61195c0e 100644
--- a/chrome/browser/extensions/extension_action.h
+++ b/chrome/browser/extensions/extension_action.h
@@ -38,6 +38,14 @@ class Size;
 // a per-tab value, the global value is used instead.
 class ExtensionAction {
  public:
+  // The action that the UI should take after the ExtensionAction is clicked.
+  enum ShowAction {
+    ACTION_NONE,
+    ACTION_SHOW_POPUP,
+    // We don't need a SHOW_CONTEXT_MENU because that's handled separately in
+    // the UI.
+  };
+
   // Use this ID to indicate the default state for properties that take a tab_id
   // parameter.
   static const int kDefaultTabId;