chrome/browser/ui/libgtk2ui/gtk2_ui.cc - Issue 235693002: Merge 260900 "linux_aura: Port GtkKeybindingsHandler to Aura."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 235693002: Merge 260900 "linux_aura: Port GtkKeybindingsHandler to Aura." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/

Patch Set: Created 6 years, 8 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

Index: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

===================================================================

--- chrome/browser/ui/libgtk2ui/gtk2_ui.cc (revision 263301)

+++ chrome/browser/ui/libgtk2ui/gtk2_ui.cc (working copy)

@@ -18,6 +18,7 @@

#include "chrome/browser/ui/libgtk2ui/app_indicator_icon.h"

#include "chrome/browser/ui/libgtk2ui/chrome_gtk_frame.h"

#include "chrome/browser/ui/libgtk2ui/gtk2_border.h"

+#include "chrome/browser/ui/libgtk2ui/gtk2_key_bindings_handler.h"

#include "chrome/browser/ui/libgtk2ui/gtk2_signal_registrar.h"

#include "chrome/browser/ui/libgtk2ui/gtk2_util.h"

#include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"

@@ -675,6 +676,15 @@

gdk_notify_startup_complete();

}

+bool Gtk2UI::MatchEvent(const ui::Event& event,

+ std::vector<ui::TextEditCommandX11>* commands) {

+ // Ensure that we have a keyboard handler.

+ if (!key_bindings_handler_)

+ key_bindings_handler_.reset(new Gtk2KeyBindingsHandler);

+ return key_bindings_handler_->MatchEvent(event, commands);

void Gtk2UI::GetScrollbarColors(GdkColor* thumb_active_color,

GdkColor* thumb_inactive_color,

GdkColor* track_color) {

« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.h ('k') | chrome/browser/ui/libgtk2ui/libgtk2ui.gyp » ('j') | no next file with comments »