Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / shell / window_type_launcher.cc

diff --git a/src/ash/shell/window_type_launcher.cc b/src/ash/shell/window_type_launcher.cc
index 9352823..61ba3fa 100644 (file)
--- a/src/ash/shell/window_type_launcher.cc
+++ b/src/ash/shell/window_type_launcher.cc
@@ -6,7 +6,7 @@
 
 #include "ash/root_window_controller.h"
 #include "ash/screensaver/screensaver_view.h"
-#include "ash/session_state_delegate.h"
+#include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
@@ -387,13 +387,16 @@ void WindowTypeLauncher::ShowContextMenuForView(
                        MenuItemView::NORMAL);
   // MenuRunner takes ownership of root.
   menu_runner_.reset(new MenuRunner(root));
-  if (menu_runner_->RunMenuAt(GetWidget(), NULL,
-        gfx::Rect(point, gfx::Size()),
-        MenuItemView::TOPLEFT,
-        source_type,
-        MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
-        MenuRunner::MENU_DELETED)
+  if (menu_runner_->RunMenuAt(
+          GetWidget(),
+          NULL,
+          gfx::Rect(point, gfx::Size()),
+          views::MENU_ANCHOR_TOPLEFT,
+          source_type,
+          MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
+      MenuRunner::MENU_DELETED) {
     return;
+  }
 }
 
 }  // namespace shell