Multi-tab selection for Linux.

chrome/browser/ui/gtk/tabs/context_menu_controller.cc

Index: chrome/browser/ui/gtk/tabs/context_menu_controller.cc
diff --git a/chrome/browser/ui/gtk/tabs/context_menu_controller.cc b/chrome/browser/ui/gtk/tabs/context_menu_controller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..364a1b4fef107862732b79da532604e21a4e79ff
--- /dev/null
+++ b/chrome/browser/ui/gtk/tabs/context_menu_controller.cc
@@ -0,0 +1,68 @@
+// Copyright (c) 2011 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/ui/gtk/tabs/context_menu_controller.h"
+
+#include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/gtk/accelerators_gtk.h"
+#include "chrome/browser/ui/gtk/menu_gtk.h"
+#include "chrome/browser/ui/gtk/tabs/tab_gtk.h"
+
+ContextMenuController::ContextMenuController(TabGtk* tab,

[Evan Stade, 2011/05/11 20:58:27]

this class should probably be TabStripContextMenuController now that there is no
TabMenu:: namespace. (And you could drop Context to reduce the length.)

[dpapad, 2011/05/11 23:30:20]

Done.

+                                             TabStripModel* model,
+                                             int index)
+    : tab_(tab),
+      model_(this, model, index) {
+  menu_.reset(new MenuGtk(this, &model_));
+}
+
+void ContextMenuController::RunMenu(const gfx::Point& point,
+                                    guint32 event_time) {
+  menu_->PopupAsContext(point, event_time);
+}
+
+void ContextMenuController::Cancel() {
+  tab_ = NULL;
+  menu_->Cancel();
+}
+
+bool ContextMenuController::IsCommandIdChecked(int command_id) const {
+  return false;
+}
+
+bool ContextMenuController::IsCommandIdEnabled(int command_id) const {
+  return tab_ && tab_->delegate()->IsCommandEnabledForTab(
+      static_cast<TabStripModel::ContextMenuCommand>(command_id),
+      tab_);
+}
+
+bool ContextMenuController::GetAcceleratorForCommandId(
+    int command_id,
+    ui::Accelerator* accelerator) {
+  int browser_command;
+  if (!TabStripModel::ContextMenuCommandToBrowserCommand(command_id,
+                                                         &browser_command))
+    return false;
+  const ui::AcceleratorGtk* accelerator_gtk =
+      AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand(
+          browser_command);
+  if (accelerator_gtk)
+    *accelerator = *accelerator_gtk;
+  return !!accelerator_gtk;
+}
+
+void ContextMenuController::ExecuteCommand(int command_id) {
+  if (!tab_)

[Evan Stade, 2011/05/11 20:58:27]

when would this be null?

[dpapad, 2011/05/11 23:30:20]

Again, I did not change these checks. tab_ is set to null in Cancel(). I am
guessing that it cant harm to have this check and avoid dereferencing a null
pointer in some corner case.

[Evan Stade, 2011/05/12 00:05:27]

so I guess it depends on whether you could call Cancel() and still get an
ExecuteCommand(). If this is possible, there should at least be a comment to
that effect which explains the conditions under which it might happen,
otherwise, this check shouldn't be here or should be a DCHECK.

[dpapad, 2011/05/12 00:34:25]

I will try and see and also ask James, since svn blame returns his name.

+    return;
+  tab_->delegate()->ExecuteCommandForTab(
+      static_cast<TabStripModel::ContextMenuCommand>(command_id), tab_);
+}
+
+GtkWidget* ContextMenuController::GetImageForCommandId(int command_id) const {
+  int browser_cmd_id;
+  return TabStripModel::ContextMenuCommandToBrowserCommand(command_id,
+                                                           &browser_cmd_id) ?
+      MenuGtk::Delegate::GetDefaultImageForCommandId(browser_cmd_id) :
+      NULL;
+}