Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / location_bar / page_action_image_view.cc

diff --git a/src/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/src/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index e690f06..bc0cc1c 100644 (file)
--- a/src/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/src/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -138,10 +138,19 @@ views::Widget* PageActionImageView::GetParentForContextMenu() {
   return GetWidget();
 }
 
+ExtensionActionViewController*
+PageActionImageView::GetPreferredPopupViewController() {
+  return view_controller_.get();
+}
+
 views::View* PageActionImageView::GetReferenceViewForPopup() {
   return this;
 }
 
+views::MenuButton* PageActionImageView::GetContextMenuButton() {
+  return NULL;  // No menu button for page action views.
+}
+
 content::WebContents* PageActionImageView::GetCurrentWebContents() {
   return owner_->GetWebContents();
 }