Consolidate ExtensionToolbarModel::Action and LocationBarController::Action

chrome/browser/extensions/extension_action.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_EXTENSIONS_EXTENSION_ACTION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 20 matching lines @@
 class ImageSkia;
 class Rect;
 class Size;
 }
 
 // ExtensionAction encapsulates the state of a browser action or page action.
 // Instances can have both global and per-tab state. If a property does not have
 // 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;
 
   // Max size (both dimensions) for page actions.
   static const int kPageActionIconMaxSize;
 
   ExtensionAction(const std::string& extension_id,
                   extensions::ActionInfo::Type action_type,
                   const extensions::ActionInfo& manifest_data);
@@ skipping 219 matching lines @@
 };
 
 template<>
 struct ExtensionAction::ValueTraits<int> {
   static int CreateEmpty() {
     return -1;
   }
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_