Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / tabs / browser_tab_strip_controller.cc

diff --git a/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index f34f3ff..26e82b2 100644 (file)
--- a/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/src/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -10,7 +10,6 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-#include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ -30,6 +29,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
+#include "components/omnibox/autocomplete_match.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
@@ -96,7 +96,9 @@ class BrowserTabStripController::TabContextMenuContents
     model_.reset(new TabMenuModel(
         this, controller->model_,
         controller->tabstrip_->GetModelIndexOfTab(tab)));
-    menu_runner_.reset(new views::MenuRunner(model_.get()));
+    menu_runner_.reset(new views::MenuRunner(
+        model_.get(),
+        views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
   }
 
   virtual ~TabContextMenuContents() {
@@ -113,9 +115,7 @@ class BrowserTabStripController::TabContextMenuContents
                                 NULL,
                                 gfx::Rect(point, gfx::Size()),
                                 views::MENU_ANCHOR_TOPLEFT,
-                                source_type,
-                                views::MenuRunner::HAS_MNEMONICS |
-                                    views::MenuRunner::CONTEXT_MENU) ==
+                                source_type) ==
         views::MenuRunner::MENU_DELETED) {
       return;
     }