Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / extensions / media_galleries_scan_result_dialog_views.cc

diff --git a/src/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc b/src/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
index 5dd295d..792a173 100644 (file)
--- a/src/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
+++ b/src/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
@@ -78,7 +78,8 @@ MediaGalleriesScanResultDialogViews::MediaGalleriesScanResultDialogViews(
   DCHECK(modal_delegate);
   window_ = views::Widget::CreateWindowAsFramelessChild(
       this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-  web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView());
+  web_contents_modal_dialog_manager->ShowModalDialog(
+      window_->GetNativeView());
 }
 
 MediaGalleriesScanResultDialogViews::~MediaGalleriesScanResultDialogViews() {}
@@ -271,8 +272,11 @@ void MediaGalleriesScanResultDialogViews::ShowContextMenu(
       controller_->GetContextMenu(id)));
 
   if (context_menu_runner_->RunMenuAt(
-          GetWidget(), NULL, gfx::Rect(point.x(), point.y(), 0, 0),
-          views::MenuItemView::TOPLEFT, source_type,
+          GetWidget(),
+          NULL,
+          gfx::Rect(point.x(), point.y(), 0, 0),
+          views::MENU_ANCHOR_TOPLEFT,
+          source_type,
           views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
       views::MenuRunner::MENU_DELETED) {
     return;