Moving the iOS directory to be remoting top level.

The remoting/client directory is intended for shared client code. But
the iOS directory is a whole client. Moving it to be more inline with
Android and webapp.

Review-Url: https://codereview.chromium.org/2871993003
Cr-Commit-Position: refs/heads/master@{#470603}

.gitignore

@@ -242,7 +242,7 @@ vs-chromium-project.txt
 /remoting/android/internal/
 /remoting/appengine/
 /remoting/host/installer/linux/internal/
-/remoting/ios/
+/remoting/ios/internal/
 /remoting/internal/
 /remoting/proto/chromotocol_proto_lib.xml
 /remoting/remoting_core_resources.xml

remoting/BUILD.gn

@@ -38,7 +38,7 @@ group("remoting_all") {
   }
 
   if (is_ios) {
-    deps += [ "//remoting/client/ios:all" ]
+    deps += [ "//remoting/ios:all" ]
   }
 
   if (enable_remoting_host) {

remoting/client/ios/BUILD.gn → remoting/ios/BUILD.gn

@@ -45,9 +45,9 @@ source_set("ios_core") {
   }
 
   public_deps = [
-    "//remoting/client/ios/domain",
-    "//remoting/client/ios/facade",
-    "//remoting/client/ios/session",
+    "//remoting/ios/domain",
+    "//remoting/ios/facade",
+    "//remoting/ios/session",
     "//third_party/webrtc/base:rtc_base",
     "//third_party/webrtc/modules/desktop_capture:primitives",
   ]

remoting/client/ios/DEPS → remoting/ios/DEPS

@@ -1,10 +1,14 @@
 include_rules = [
   "+media/base",
+  "+net",
   "+google/protobuf",
   "+google_apis",
   "+ios/third_party/material_components_ios/src",
+  "+remoting/base",
+  "+remoting/client",
   "+remoting/codec",
-  "+remoting/client/ios",
+  "+remoting/protocol",
+  "+remoting/ios",
   "+remoting/signaling",
   "+third_party/libjingle_xmpp",
   "+third_party/webrtc",

remoting/client/ios/app/BUILD.gn → remoting/ios/app/BUILD.gn

@@ -42,7 +42,7 @@ source_set("main") {
     "//google_apis",
     "//remoting/base",
     "//remoting/client",
-    "//remoting/client/ios:ios_core",
+    "//remoting/ios:ios_core",
     "//remoting/protocol",
     "//ui/base",
     "//ui/gfx",
@@ -57,7 +57,7 @@ source_set("main") {
 }
 
 tweak_info_plist("tweak_info_plist") {
-  info_plist = "//remoting/client/ios/app/resources/Info.plist"
+  info_plist = "//remoting/ios/app/resources/Info.plist"
   args = [ "--platform=ios" ]
 }
 
@@ -94,10 +94,10 @@ ios_app_bundle("ios_remoting_app") {
   deps = [
     ":main",
     "//base",
-    "//remoting/client/ios/app/resources:assets",
-    "//remoting/client/ios/app/resources:launchscreen_assets",
-    "//remoting/client/ios/app/resources:remoting_icons",
-    "//remoting/client/ios/display",
+    "//remoting/ios/app/resources:assets",
+    "//remoting/ios/app/resources:launchscreen_assets",
+    "//remoting/ios/app/resources:remoting_icons",
+    "//remoting/ios/display",
   ]
 
   bundle_deps = [ ":launchscreen_storyboard" ]

remoting/client/ios/app/app_delegate.h → remoting/ios/app/app_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_APP_DELEGATE_H_
-#define REMOTING_CLIENT_IOS_APP_APP_DELEGATE_H_
+#ifndef REMOTING_IOS_APP_APP_DELEGATE_H_
+#define REMOTING_IOS_APP_APP_DELEGATE_H_
 
 #import <UIKit/UIKit.h>
 
@@ -14,5 +14,5 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_APP_DELEGATE_H_
+#endif  // REMOTING_IOS_APP_APP_DELEGATE_H_
 

remoting/client/ios/app/app_delegate.mm → remoting/ios/app/app_delegate.mm

@@ -6,15 +6,15 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/app_delegate.h"
+#import "remoting/ios/app/app_delegate.h"
 
 #include "base/logging.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#import "remoting/client/ios/app/remoting_view_controller.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/app/remoting_view_controller.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 @implementation AppDelegate
 

remoting/client/ios/app/client_connection_view_controller.h → remoting/ios/app/client_connection_view_controller.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
@@ -44,4 +44,4 @@ typedef NS_ENUM(NSInteger, ClientConnectionViewState) {
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_

remoting/client/ios/app/client_connection_view_controller.mm → remoting/ios/app/client_connection_view_controller.mm

@@ -6,14 +6,14 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/client_connection_view_controller.h"
+#import "remoting/ios/app/client_connection_view_controller.h"
 
 #import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MDCActivityIndicator.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"
-#import "remoting/client/ios/app/pin_entry_view.h"
-#import "remoting/client/ios/domain/client_session_details.h"
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/app/pin_entry_view.h"
+#import "remoting/ios/domain/client_session_details.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/protocol/client_authentication_config.h"

remoting/client/ios/app/host_collection_view_cell.h → remoting/ios/app/host_collection_view_cell.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
-#define REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
+#ifndef REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
+#define REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
 
 #import <UIKit/UIKit.h>
 
@@ -20,4 +20,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
+#endif  // REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_

remoting/client/ios/app/host_collection_view_cell.mm → remoting/ios/app/host_collection_view_cell.mm

@@ -8,12 +8,12 @@
 
 #import <UIKit/UIKit.h>
 
-#import "remoting/client/ios/app/host_collection_view_cell.h"
+#import "remoting/ios/app/host_collection_view_cell.h"
 
 #import "ios/third_party/material_components_ios/src/components/ShadowElevations/src/MaterialShadowElevations.h"
 #import "ios/third_party/material_components_ios/src/components/ShadowLayer/src/MaterialShadowLayer.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/domain/host_info.h"
 
 static const CGFloat kLinePadding = 2.f;
 static const CGFloat kHostCardIconInset = 10.f;

remoting/client/ios/app/host_collection_view_controller.h → remoting/ios/app/host_collection_view_controller.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
-#define REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
+#ifndef REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
+#define REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
 
 #import <UIKit/UIKit.h>
 
 #import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
 #import "ios/third_party/material_components_ios/src/components/FlexibleHeader/src/MaterialFlexibleHeader.h"
-#import "remoting/client/ios/app/host_collection_view_cell.h"
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/app/host_collection_view_cell.h"
+#import "remoting/ios/domain/host_info.h"
 
 // The host collection view controller delegate provides the data for available
 // hosts and receives selection events from the collection view controller.
@@ -40,4 +40,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_HOST_LIST_VIEW_CONTOLLER_H_
+#endif  // REMOTING_IOS_APP_HOST_LIST_VIEW_CONTOLLER_H_

remoting/client/ios/app/host_collection_view_controller.mm → remoting/ios/app/host_collection_view_controller.mm

@@ -6,7 +6,7 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/host_collection_view_controller.h"
+#import "remoting/ios/app/host_collection_view_controller.h"
 
 #import "ios/third_party/material_components_ios/src/components/Ink/src/MaterialInk.h"
 #import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"

remoting/client/ios/app/host_view_controller.h → remoting/ios/app/host_view_controller.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_HOST_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_HOST_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_HOST_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_HOST_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
-#include "remoting/client/ios/display/gl_display_handler.h"
+#include "remoting/ios/display/gl_display_handler.h"
 
 @class RemotingClient;
 
@@ -20,4 +20,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_REMOTING_HOST_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_REMOTING_HOST_VIEW_CONTROLLER_H_

remoting/client/ios/app/host_view_controller.mm → remoting/ios/app/host_view_controller.mm

@@ -6,15 +6,15 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/host_view_controller.h"
+#import "remoting/ios/app/host_view_controller.h"
 
 #include <memory>
 
 #import <GLKit/GLKit.h>
 
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
-#import "remoting/client/ios/client_gestures.h"
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/client_gestures.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "remoting/client/gesture_interpreter.h"
 

remoting/client/ios/app/main.mm → remoting/ios/app/main.mm

@@ -10,7 +10,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
-#import "remoting/client/ios/app/app_delegate.h"
+#import "remoting/ios/app/app_delegate.h"
 
 int main(int argc, char* argv[]) {
   // This class is designed to fulfill the dependents needs when it goes out of

remoting/client/ios/app/pin_entry_view.h → remoting/ios/app/pin_entry_view.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_PIN_ENTRY_VIEW_H_
-#define REMOTING_CLIENT_IOS_APP_PIN_ENTRY_VIEW_H_
+#ifndef REMOTING_IOS_APP_PIN_ENTRY_VIEW_H_
+#define REMOTING_IOS_APP_PIN_ENTRY_VIEW_H_
 
 #import <UIKit/UIKit.h>
 
@@ -25,4 +25,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_PIN_ENTRY_VIEW_H_
+#endif  // REMOTING_IOS_APP_PIN_ENTRY_VIEW_H_

remoting/client/ios/app/pin_entry_view.mm → remoting/ios/app/pin_entry_view.mm

@@ -6,7 +6,7 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/pin_entry_view.h"
+#import "remoting/ios/app/pin_entry_view.h"
 
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 

remoting/client/ios/app/remoting_settings_view_controller.h → remoting/ios/app/remoting_settings_view_controller.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
 
 #import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
 
 @interface RemotingSettingsViewController : MDCCollectionViewController
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_

remoting/client/ios/app/remoting_settings_view_controller.mm → remoting/ios/app/remoting_settings_view_controller.mm

@@ -6,12 +6,12 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/remoting_settings_view_controller.h"
+#import "remoting/ios/app/remoting_settings_view_controller.h"
 
 #import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 #include "base/strings/stringprintf.h"
 #include "google_apis/google_api_keys.h"

remoting/client/ios/app/remoting_view_controller.h → remoting/ios/app/remoting_view_controller.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
 
 #import "ios/third_party/material_components_ios/src/components/FlexibleHeader/src/MaterialFlexibleHeader.h"
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 @interface RemotingViewController : MDCFlexibleHeaderContainerViewController
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_REMOTING_VIEW_CONTROLLER_H_

remoting/client/ios/app/remoting_view_controller.mm → remoting/ios/app/remoting_view_controller.mm

@@ -6,21 +6,21 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/remoting_view_controller.h"
+#import "remoting/ios/app/remoting_view_controller.h"
 
 #import "base/mac/bind_objc_block.h"
 #import "ios/third_party/material_components_ios/src/components/AnimationTiming/src/MaterialAnimationTiming.h"
 #import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
 #import "ios/third_party/material_components_ios/src/components/Dialogs/src/MaterialDialogs.h"
 #import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
-#import "remoting/client/ios/app/client_connection_view_controller.h"
-#import "remoting/client/ios/app/host_collection_view_controller.h"
-#import "remoting/client/ios/app/host_view_controller.h"
-#import "remoting/client/ios/app/remoting_settings_view_controller.h"
-#import "remoting/client/ios/domain/client_session_details.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/app/client_connection_view_controller.h"
+#import "remoting/ios/app/host_collection_view_controller.h"
+#import "remoting/ios/app/host_view_controller.h"
+#import "remoting/ios/app/remoting_settings_view_controller.h"
+#import "remoting/ios/domain/client_session_details.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/base/oauth_token_getter.h"