Review Changes

Author: gspencergoog

shell/platform/darwin/macos/framework/Source/FlutterIntermediateKeyResponder.h

@@ -5,20 +5,24 @@
 #import <Cocoa/Cocoa.h>
 
 /*
- * An interface for adding key responders that can declare itself as the final
+ * An interface for a key responder that can declare itself as the final
  * responder of the event, terminating the event propagation.
  *
  * It differs from an NSResponder in that it returns a boolean from the
  * handleKeyUp and handleKeyDown calls, where true means it has handled the
- * given event. A handled event is not passed to the next responder.
+ * given event.
  */
 @interface FlutterIntermediateKeyResponder : NSObject
 /*
  * Informs the receiver that the user has released a key.
+ *
+ * Default implementation returns NO.
  */
-- (BOOL)handleKeyUp:(NSEvent*)event;
+- (BOOL)handleKeyUp:(nonnull NSEvent*)event;
 /*
  * Informs the receiver that the user has pressed a key.
+ *
+ * Default implementation returns NO.
  */
-- (BOOL)handleKeyDown:(NSEvent*)event;
+- (BOOL)handleKeyDown:(nonnull NSEvent*)event;
 @end

shell/platform/darwin/macos/framework/Source/FlutterViewController.mm

@@ -219,7 +219,7 @@ @implementation FlutterViewController {
  * Performs initialization that's common between the different init paths.
  */
 static void CommonInit(FlutterViewController* controller) {
-  if (controller->_engine == nullptr) {
+  if (!controller->_engine) {
     controller->_engine = [[FlutterEngine alloc] initWithName:@"io.flutter"
                                                       project:controller->_project
                                        allowHeadlessExecution:NO];
@@ -260,11 +260,11 @@ - (instancetype)initWithEngine:(nonnull FlutterEngine*)engine
   self = [super initWithNibName:nibName bundle:nibBundle];
   if (self) {
     if (engine.viewController) {
-      NSLog(@"The supplied FlutterEngine %s is already used with FlutterViewController "
-             "instance %s. One instance of the FlutterEngine can only be attached to one "
+      NSLog(@"The supplied FlutterEngine %@ is already used with FlutterViewController "
+             "instance %@. One instance of the FlutterEngine can only be attached to one "
              "FlutterViewController at a time. Set FlutterEngine.viewController "
              "to nil before attaching it to another FlutterViewController.",
-            [[engine description] UTF8String], [[engine.viewController description] UTF8String]);
+            [engine description], [engine.viewController description]);
     }
     _engine = engine;
     CommonInit(self);

shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm

@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "FlutterBinaryMessenger.h"
+#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h"
 
 #import <OCMock/OCMock.h>
 
+#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h"
 #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h"
 #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTestUtils.h"
-#include "flutter/testing/testing.h"
+#import "flutter/testing/testing.h"
 
 @interface FlutterViewControllerTestObjC : NSObject
 - (bool)testKeyEventsAreSentToFramework;