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

Unified Diff: views/controls/menu/native_menu_gtk.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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 | « views/controls/menu/menu_win.cc ('k') | views/controls/menu/native_menu_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/native_menu_gtk.cc
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index d6b8394d4a18a6cacaf447400b0c952323bb9003..85b87b5f934b8f7e6dc68c6cdcdc46ca6eb5dc56 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -16,10 +16,10 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/models/accelerator.h"
#include "ui/base/models/menu_model.h"
#include "ui/gfx/font.h"
#include "ui/gfx/gtk_util.h"
-#include "views/accelerator.h"
#include "views/controls/menu/menu_2.h"
#include "views/controls/menu/menu_listener.h"
#include "views/controls/menu/nested_dispatcher_gtk.h"
@@ -420,7 +420,7 @@ GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
G_CALLBACK(OnMenuMoveCurrentThunk), this);
}
- views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
+ ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
if (accel_group && model_->GetAcceleratorAt(index, &accelerator)) {
int gdk_modifiers = 0;
if (accelerator.IsShiftDown())
« no previous file with comments | « views/controls/menu/menu_win.cc ('k') | views/controls/menu/native_menu_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698