Revert 34858 - Merge 34812 Add the rightclick context menu for Browser actio...

chrome/browser/views/location_bar_view.h

 // Copyright (c) 2009 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_VIEWS_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <map>
 #include <vector>
 
 #include "app/gfx/font.h"
 #include "base/gfx/rect.h"
 #include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/browser_bubble.h"
-#include "chrome/browser/views/extensions/extension_action_context_menu.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/painter.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
@@ skipping 389 matching lines @@
     Profile* profile_;
 
     // The PageAction that this view represents. The PageAction is not owned by
     // us, it resides in the extension of this particular profile.
     ExtensionAction* page_action_;
 
     // A cache of bitmaps the page actions might need to show, mapped by path.
     typedef std::map<std::string, SkBitmap> PageActionMap;
     PageActionMap page_action_icons_;
 
-    // The context menu for this page action.
-    scoped_ptr<ExtensionActionContextMenu> context_menu_;
-
     // The object that is waiting for the image loading to complete
     // asynchronously.
     ImageLoadingTracker* tracker_;
 
     // The tab id we are currently showing the icon for.
     int current_tab_id_;
 
     // The URL we are currently showing the icon for.
     GURL current_url_;
 
@@ skipping 150 matching lines @@
   // The positioner that places the omnibox and info bubbles.
   const BubblePositioner* bubble_positioner_;
 
   // Storage of string needed for accessibility.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_