ui/views/cocoa/bridged_content_view.mm - Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/

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: ui/views/cocoa/bridged_content_view.mm

Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 7 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

« no previous file with comments | « ui/ozone/public/system_input_injector.h ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 #import "ui/views/cocoa/bridged_content_view.h"	5 #import "ui/views/cocoa/bridged_content_view.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #import "base/mac/scoped_nsobject.h"	8 #import "base/mac/scoped_nsobject.h"

9 #include "base/strings/sys_string_conversions.h"	9 #include "base/strings/sys_string_conversions.h"

10 #include "ui/base/ime/text_input_client.h"	10 #include "ui/base/ime/text_input_client.h"

11 #include "ui/compositor/paint_context.h"	11 #include "ui/compositor/paint_context.h"

12 #import "ui/events/cocoa/cocoa_event_utils.h"	12 #import "ui/events/cocoa/cocoa_event_utils.h"

13 #include "ui/events/keycodes/dom3/dom_code.h"	13 #include "ui/events/keycodes/dom/dom_code.h"

14 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"	14 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"

15 #include "ui/gfx/canvas_paint_mac.h"	15 #include "ui/gfx/canvas_paint_mac.h"

16 #include "ui/gfx/geometry/rect.h"	16 #include "ui/gfx/geometry/rect.h"

17 #include "ui/strings/grit/ui_strings.h"	17 #include "ui/strings/grit/ui_strings.h"

18 #include "ui/views/controls/menu/menu_controller.h"	18 #include "ui/views/controls/menu/menu_controller.h"

19 #include "ui/views/ime/input_method.h"	19 #include "ui/views/ime/input_method.h"

20 #include "ui/views/view.h"	20 #include "ui/views/view.h"

21 #include "ui/views/widget/widget.h"	21 #include "ui/views/widget/widget.h"

22	22

23 using views::MenuController;	23 using views::MenuController;

(...skipping 697 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
721 }	721 }

722	722

723 return [super accessibilityAttributeValue:attribute];	723 return [super accessibilityAttributeValue:attribute];

724 }	724 }

725	725

726 - (id)accessibilityHitTest:(NSPoint)point {	726 - (id)accessibilityHitTest:(NSPoint)point {

727 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];	727 return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];

728 }	728 }

729	729

730 @end	730 @end

OLD	NEW