Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: chrome/browser/ui/gtk/menu_gtk.cc

Issue 7712001: WindowOpenDisposition should not be exposed in base and ui modules. (1) Gdk refactoring (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: minor fix. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util_unittest.cc ('k') | chrome/browser/ui/gtk/reload_button_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/menu_gtk.cc
diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc
index 9d762199b88466c0b5edc26e79a9f70c1e75e45b..95eb1e5a9f429ad2790c60582461d68e719684f0 100644
--- a/chrome/browser/ui/gtk/menu_gtk.cc
+++ b/chrome/browser/ui/gtk/menu_gtk.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/ui/gtk/gtk_custom_menu.h"
#include "chrome/browser/ui/gtk/gtk_custom_menu_item.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/browser/ui/views/event_utils.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/models/accelerator_gtk.h"
#include "ui/base/models/button_menu_item_model.h"
@@ -707,8 +708,10 @@ void MenuGtk::ExecuteCommand(ui::MenuModel* model, int id) {
GdkEvent* event = gtk_get_current_event();
if (event && event->type == GDK_BUTTON_RELEASE) {
- model->ActivatedAtWithDisposition(
- id, event_utils::DispositionFromEventFlags(event->button.state));
+ WindowOpenDisposition disposition =
+ event_utils::DispositionFromGdkState(event->button.state);
+
+ model->ActivatedAtWithDisposition(id, disposition);
} else {
model->ActivatedAt(id);
}
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util_unittest.cc ('k') | chrome/browser/ui/gtk/reload_button_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698