Merge 34812 - Add the rightclick context menu for Browser actions and Page...

chrome/browser/views/location_bar_view.cc

 // 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.
 
 #include "chrome/browser/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1355 matching lines @@
 void LocationBarView::PageActionImageView::OnMouseMoved(
     const views::MouseEvent& event) {
   // PageActionImageView uses normal tooltips rather than the info bubble,
   // so just do nothing here rather than letting LocationBarImageView start
   // its hover timer.
 }
 
 bool LocationBarView::PageActionImageView::OnMousePressed(
     const views::MouseEvent& event) {
   int button = -1;
-  if (event.IsLeftMouseButton())
+  if (event.IsLeftMouseButton()) {
     button = 1;
-  else if (event.IsMiddleMouseButton())
+  } else if (event.IsMiddleMouseButton()) {
     button = 2;
-  else if (event.IsRightMouseButton())
-    button = 3;
+  } else if (event.IsRightMouseButton()) {
+    // Get the top left point of this button in screen coordinates.
+    gfx::Point point = gfx::Point(0,0);
+    ConvertPointToScreen(this, &point);
+
+    // Make the menu appear below the button.
+    point.Offset(0, height());
+
+    Extension* extension = profile_->GetExtensionsService()->GetExtensionById(
+        page_action()->extension_id(), false);
+
+    if (!context_menu_.get())
+      context_menu_.reset(new ExtensionActionContextMenu());
+    context_menu_->Run(extension, point);
+    return false;
+  }
 
   ExecuteAction(button);
   return true;
 }
 
 void LocationBarView::PageActionImageView::ShowInfoBubble() {
   ShowInfoBubbleImpl(ASCIIToWide(tooltip_), GetColor(false, TEXT));
 }
 
 void LocationBarView::PageActionImageView::OnImageLoaded(SkBitmap* image,
@@ skipping 208 matching lines @@
           const int button = 1;  // Left mouse button.
           page_action_views_[i]->image_view()->ExecuteAction(button);
           return;
         }
         ++current;
       }
     }
   }
   NOTREACHED();
 }