ui/base/cocoa/menu_controller.mm - Issue 160083003: Split cocoa_event_utils in two parts.

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: ui/base/cocoa/menu_controller.mm

Issue 160083003: Split cocoa_event_utils in two parts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: still works? Created 6 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:

Index: ui/base/cocoa/menu_controller.mm

diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm

index ad3ada556cfedc14159462110db67e0a8db0122e..f7f8dbf6c5d6e00a7f6f5f9341d0fd9bc9bc8ab8 100644

--- a/ui/base/cocoa/menu_controller.mm

+++ b/ui/base/cocoa/menu_controller.mm

@@ -8,9 +8,9 @@

#include "base/strings/sys_string_conversions.h"

#include "ui/base/accelerators/accelerator.h"

#include "ui/base/accelerators/platform_accelerator_cocoa.h"

-#import "ui/base/cocoa/cocoa_event_utils.h"

#include "ui/base/l10n/l10n_util_mac.h"

#include "ui/base/models/simple_menu_model.h"

+#import "ui/events/event_utils.h"

#include "ui/gfx/font_list.h"

#include "ui/gfx/image/image.h"

#include "ui/gfx/text_elider.h"

@@ -204,7 +204,7 @@

[[sender representedObject] pointerValue]);

DCHECK(model);

if (model) {

- int event_flags = ui::EventFlagsFromNSEvent([NSApp currentEvent]);

+ int event_flags = ui::EventFlagsFromNative([NSApp currentEvent]);

model->ActivatedAt(modelIndex, event_flags);

}

« no previous file with comments | « ui/base/cocoa/cocoa_event_utils_unittest.mm ('k') | ui/events/cocoa/cocoa_event_utils.h » ('j') | no next file with comments »