views/event_gtk.cc - Issue 6246001: Move app/key* to ui/base/keycodes/*

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: views/event_gtk.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 11 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « views/event.cc ('k') | views/event_win.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "views/event.h"	5 #include "views/event.h"

6	6

7 #include <gdk/gdk.h>	7 #include <gdk/gdk.h>

8	8

9 #include "app/keyboard_code_conversion_gtk.h"	9 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"

10	10

11 namespace views {	11 namespace views {

12	12

13 KeyEvent::KeyEvent(const GdkEventKey* event)	13 KeyEvent::KeyEvent(const GdkEventKey* event)

14 : Event(event->type == GDK_KEY_PRESS ?	14 : Event(event->type == GDK_KEY_PRESS ?

15 Event::ET_KEY_PRESSED : Event::ET_KEY_RELEASED,	15 Event::ET_KEY_PRESSED : Event::ET_KEY_RELEASED,

16 GetFlagsFromGdkState(event->state)),	16 GetFlagsFromGdkState(event->state)),

17 // TODO(erg): All these values are iffy.	17 // TODO(erg): All these values are iffy.

18 key_code_(app::WindowsKeyCodeForGdkKeyCode(event->keyval)),	18 key_code_(app::WindowsKeyCodeForGdkKeyCode(event->keyval)),

19 repeat_count_(0),	19 repeat_count_(0),

(...skipping 18 matching lines...) Expand all Loading...
38 if (state & GDK_BUTTON1_MASK)	38 if (state & GDK_BUTTON1_MASK)

39 flags \|= Event::EF_LEFT_BUTTON_DOWN;	39 flags \|= Event::EF_LEFT_BUTTON_DOWN;

40 if (state & GDK_BUTTON2_MASK)	40 if (state & GDK_BUTTON2_MASK)

41 flags \|= Event::EF_MIDDLE_BUTTON_DOWN;	41 flags \|= Event::EF_MIDDLE_BUTTON_DOWN;

42 if (state & GDK_BUTTON3_MASK)	42 if (state & GDK_BUTTON3_MASK)

43 flags \|= Event::EF_RIGHT_BUTTON_DOWN;	43 flags \|= Event::EF_RIGHT_BUTTON_DOWN;

44 return flags;	44 return flags;

45 }	45 }

46	46

47 } // namespace views	47 } // namespace views

OLD	NEW