From 02547a3d471b9834b583b681b92af91dc016156d Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Thu, 10 Mar 2016 12:23:19 -0800 Subject: [PATCH] iOS: Rename ObjC files to follow Google style guide --- sky/shell/BUILD.gn | 17 ++++++++++------- ...tter_app_delegate.h => FlutterAppDelegate.h} | 0 ...er_app_delegate.mm => FlutterAppDelegate.mm} | 2 +- ...e_loader.h => FlutterDynamicServiceLoader.h} | 0 ...loader.mm => FlutterDynamicServiceLoader.mm} | 2 +- .../ios/{flutter_view.h => FlutterView.h} | 0 .../ios/{flutter_view.mm => FlutterView.mm} | 2 +- ...w_controller.mm => FlutterViewController.mm} | 4 ++-- sky/shell/platform/ios/main_ios.mm | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-) rename sky/shell/platform/ios/{flutter_app_delegate.h => FlutterAppDelegate.h} (100%) rename sky/shell/platform/ios/{flutter_app_delegate.mm => FlutterAppDelegate.mm} (94%) rename sky/shell/platform/ios/{flutter_dynamic_service_loader.h => FlutterDynamicServiceLoader.h} (100%) rename sky/shell/platform/ios/{flutter_dynamic_service_loader.mm => FlutterDynamicServiceLoader.mm} (98%) rename sky/shell/platform/ios/{flutter_view.h => FlutterView.h} (100%) rename sky/shell/platform/ios/{flutter_view.mm => FlutterView.mm} (93%) rename sky/shell/platform/ios/{flutter_view_controller.mm => FlutterViewController.mm} (99%) diff --git a/sky/shell/BUILD.gn b/sky/shell/BUILD.gn index 9d759a34651..755ba582392 100644 --- a/sky/shell/BUILD.gn +++ b/sky/shell/BUILD.gn @@ -238,16 +238,19 @@ if (is_android) { "Must specific if the scaffolding is exposed as a framework") source_set(target_name) { + sources = [ - "platform/ios/flutter_app_delegate.h", - "platform/ios/flutter_app_delegate.mm", - "platform/ios/flutter_dynamic_service_loader.h", - "platform/ios/flutter_dynamic_service_loader.mm", + "platform/ios/FlutterAppDelegate.h", + "platform/ios/FlutterAppDelegate.mm", + "platform/ios/FlutterDynamicServiceLoader.h", + "platform/ios/FlutterDynamicServiceLoader.mm", + "platform/ios/FlutterView.h", + "platform/ios/FlutterView.mm", + "platform/ios/FlutterViewController.mm", "platform/ios/flutter_touch_mapper.h", "platform/ios/flutter_touch_mapper.mm", - "platform/ios/flutter_view.h", - "platform/ios/flutter_view.mm", - "platform/ios/flutter_view_controller.mm", + "platform/ios/framework/Info.plist", + "platform/ios/framework/module.modulemap", "platform/ios/main_ios.mm", "platform/ios/public/Flutter.h", "platform/ios/public/FlutterMacros.h", diff --git a/sky/shell/platform/ios/flutter_app_delegate.h b/sky/shell/platform/ios/FlutterAppDelegate.h similarity index 100% rename from sky/shell/platform/ios/flutter_app_delegate.h rename to sky/shell/platform/ios/FlutterAppDelegate.h diff --git a/sky/shell/platform/ios/flutter_app_delegate.mm b/sky/shell/platform/ios/FlutterAppDelegate.mm similarity index 94% rename from sky/shell/platform/ios/flutter_app_delegate.mm rename to sky/shell/platform/ios/FlutterAppDelegate.mm index 8c315c153a3..d099572ef1b 100644 --- a/sky/shell/platform/ios/flutter_app_delegate.mm +++ b/sky/shell/platform/ios/FlutterAppDelegate.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/shell/platform/ios/flutter_app_delegate.h" +#include "sky/shell/platform/ios/FlutterAppDelegate.h" #include "sky/shell/platform/ios/public/FlutterViewController.h" #include "base/trace_event/trace_event.h" diff --git a/sky/shell/platform/ios/flutter_dynamic_service_loader.h b/sky/shell/platform/ios/FlutterDynamicServiceLoader.h similarity index 100% rename from sky/shell/platform/ios/flutter_dynamic_service_loader.h rename to sky/shell/platform/ios/FlutterDynamicServiceLoader.h diff --git a/sky/shell/platform/ios/flutter_dynamic_service_loader.mm b/sky/shell/platform/ios/FlutterDynamicServiceLoader.mm similarity index 98% rename from sky/shell/platform/ios/flutter_dynamic_service_loader.mm rename to sky/shell/platform/ios/FlutterDynamicServiceLoader.mm index 9c0dbb4492a..7e12d6feceb 100644 --- a/sky/shell/platform/ios/flutter_dynamic_service_loader.mm +++ b/sky/shell/platform/ios/FlutterDynamicServiceLoader.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/shell/platform/ios/flutter_dynamic_service_loader.h" +#include "sky/shell/platform/ios/FlutterDynamicServiceLoader.h" #include "sky/services/dynamic/dynamic_service_embedder.h" #include "sky/services/dynamic/dynamic_service_definition.h" #include diff --git a/sky/shell/platform/ios/flutter_view.h b/sky/shell/platform/ios/FlutterView.h similarity index 100% rename from sky/shell/platform/ios/flutter_view.h rename to sky/shell/platform/ios/FlutterView.h diff --git a/sky/shell/platform/ios/flutter_view.mm b/sky/shell/platform/ios/FlutterView.mm similarity index 93% rename from sky/shell/platform/ios/flutter_view.mm rename to sky/shell/platform/ios/FlutterView.mm index 8c0f4a52d6c..53c6c7375da 100644 --- a/sky/shell/platform/ios/flutter_view.mm +++ b/sky/shell/platform/ios/FlutterView.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/shell/platform/ios/flutter_view.h" +#include "sky/shell/platform/ios/FlutterView.h" @interface FlutterView () diff --git a/sky/shell/platform/ios/flutter_view_controller.mm b/sky/shell/platform/ios/FlutterViewController.mm similarity index 99% rename from sky/shell/platform/ios/flutter_view_controller.mm rename to sky/shell/platform/ios/FlutterViewController.mm index 76ff4fecd50..1ce68ce73f3 100644 --- a/sky/shell/platform/ios/flutter_view_controller.mm +++ b/sky/shell/platform/ios/FlutterViewController.mm @@ -10,9 +10,9 @@ #include "sky/engine/wtf/MakeUnique.h" #include "sky/services/engine/sky_engine.mojom.h" #include "sky/services/platform/ios/system_chrome_impl.h" -#include "sky/shell/platform/ios/flutter_dynamic_service_loader.h" #include "sky/shell/platform/ios/flutter_touch_mapper.h" -#include "sky/shell/platform/ios/flutter_view.h" +#include "sky/shell/platform/ios/FlutterDynamicServiceLoader.h" +#include "sky/shell/platform/ios/FlutterView.h" #include "sky/shell/platform/mac/platform_mac.h" #include "sky/shell/platform/mac/platform_view_mac.h" #include "sky/shell/platform_view.h" diff --git a/sky/shell/platform/ios/main_ios.mm b/sky/shell/platform/ios/main_ios.mm index 15ad04b9f53..f3f2ef8f7ff 100644 --- a/sky/shell/platform/ios/main_ios.mm +++ b/sky/shell/platform/ios/main_ios.mm @@ -4,7 +4,7 @@ #import -#include "sky/shell/platform/ios/flutter_app_delegate.h" +#include "sky/shell/platform/ios/FlutterAppDelegate.h" #include "sky/shell/platform/mac/platform_mac.h" int main(int argc, const char* argv[]) {