chrome/browser/ui/views/dropdown_bar_host_gtk.cc - Issue 6488012: Revert 74518 - Refactor TOUCH_UI to match other refactor....

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: chrome/browser/ui/views/dropdown_bar_host_gtk.cc

Issue 6488012: Revert 74518 - Refactor TOUCH_UI to match other refactor.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 10 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 | « chrome/browser/renderer_host/render_widget_host_view_views.cc ('k') | views/focus/accelerator_handler_touch.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "chrome/browser/ui/views/dropdown_bar_host.h"	5 #include "chrome/browser/ui/views/dropdown_bar_host.h"

6	6

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

8	8

9 #include "chrome/browser/tab_contents/tab_contents.h"	9 #include "chrome/browser/tab_contents/tab_contents.h"

10 #include "chrome/browser/ui/views/frame/browser_view.h"	10 #include "chrome/browser/ui/views/frame/browser_view.h"

(...skipping 19 matching lines...) Expand all Loading...
30	30

31 NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent(	31 NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent(

32 const TabContents* contents,	32 const TabContents* contents,

33 const views::KeyEvent& key_event) {	33 const views::KeyEvent& key_event) {

34 #if defined(TOUCH_UI)	34 #if defined(TOUCH_UI)

35 // TODO(oshima): This is a copy from	35 // TODO(oshima): This is a copy from

36 // RenderWidgetHostViewViews::OnKeyPressed().	36 // RenderWidgetHostViewViews::OnKeyPressed().

37 // Refactor and eliminate the dup code.	37 // Refactor and eliminate the dup code.

38 NativeWebKeyboardEvent wke;	38 NativeWebKeyboardEvent wke;

39 wke.type = WebKit::WebInputEvent::KeyDown;	39 wke.type = WebKit::WebInputEvent::KeyDown;

40 wke.windowsKeyCode = key_event.key_code();	40 wke.windowsKeyCode = key_event.GetKeyCode();

41 wke.setKeyIdentifierFromWindowsKeyCode();	41 wke.setKeyIdentifierFromWindowsKeyCode();

42	42

43 wke.text[0] = wke.unmodifiedText[0] =	43 wke.text[0] = wke.unmodifiedText[0] =

44 static_cast<unsigned short>(gdk_keyval_to_unicode(	44 static_cast<unsigned short>(gdk_keyval_to_unicode(

45 ui::GdkKeyCodeForWindowsKeyCode(key_event.key_code(),	45 ui::GdkKeyCodeForWindowsKeyCode(key_event.GetKeyCode(),

46 key_event.IsShiftDown() ^ key_event.IsCapsLockDown())));	46 key_event.IsShiftDown() ^ key_event.IsCapsLockDown())));

47 return wke;	47 return wke;

48 #else	48 #else

49 return NativeWebKeyboardEvent(key_event.native_event());	49 return NativeWebKeyboardEvent(key_event.native_event());

50 #endif	50 #endif

51 }	51 }

OLD	NEW