Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: ui/views/test/event_generator_delegate_mac.mm

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
OLDNEW
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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <stddef.h>
6 7
7 #import "base/mac/scoped_nsobject.h" 8 #import "base/mac/scoped_nsobject.h"
8 #import "base/mac/scoped_objc_class_swizzler.h" 9 #import "base/mac/scoped_objc_class_swizzler.h"
10 #include "base/macros.h"
9 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
10 #include "ui/events/event_processor.h" 12 #include "ui/events/event_processor.h"
11 #include "ui/events/event_target.h" 13 #include "ui/events/event_target.h"
12 #include "ui/events/event_target_iterator.h" 14 #include "ui/events/event_target_iterator.h"
13 #include "ui/events/event_targeter.h" 15 #include "ui/events/event_targeter.h"
14 #import "ui/events/test/cocoa_test_event_utils.h" 16 #import "ui/events/test/cocoa_test_event_utils.h"
15 #include "ui/events/test/event_generator.h" 17 #include "ui/events/test/event_generator.h"
16 #include "ui/gfx/mac/coordinate_conversion.h" 18 #include "ui/gfx/mac/coordinate_conversion.h"
17 19
18 namespace { 20 namespace {
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 - (NSEvent*)currentEvent { 483 - (NSEvent*)currentEvent {
482 if (g_current_event) 484 if (g_current_event)
483 return g_current_event; 485 return g_current_event;
484 486
485 // Find the original implementation and invoke it. 487 // Find the original implementation and invoke it.
486 IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod(); 488 IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod();
487 return original(self, _cmd); 489 return original(self, _cmd);
488 } 490 }
489 491
490 @end 492 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698