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

Unified Diff: remoting/ios/app/main.mm

Issue 2937733003: [CRD iOS] Branching internal and external implementations (Closed)
Patch Set: Merge w/ ToT Created 3 years, 6 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:
View side-by-side diff with in-line comments
Download patch
Index: remoting/ios/app/main.mm
diff --git a/remoting/ios/app/main.mm b/remoting/ios/app/main.mm
index 611fee9bc5f658ccd59990fe052aa88a53f1e819..b2cc9f657bbf11752302b1c7d2acca7ed889e291 100644
--- a/remoting/ios/app/main.mm
+++ b/remoting/ios/app/main.mm
@@ -9,28 +9,21 @@
#import <UIKit/UIKit.h>
#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/i18n/icu_util.h"
+#include "remoting/ios/app/app_initializer.h"
nicholss 2017/06/14 15:37:59 I think this is too complicated. If there needs to
Yuwei 2017/06/15 07:02:08 Removed.
+
#import "remoting/ios/app/app_delegate.h"
+#import "remoting/ios/app/remoting_resource_factory_external.h"
int main(int argc, char* argv[]) {
// This class is designed to fulfill the dependents needs when it goes out of
// scope and gets destructed.
base::AtExitManager exitManager;
- // Publicize the CommandLine.
- base::CommandLine::Init(argc, argv);
-
- // Required to find the ICU data file, used by some file_util routines.
- base::i18n::InitializeICU();
-
-#ifdef DEBUG
- // Set min log level for debug builds. For some reason this has to be
- // negative.
- logging::SetMinLogLevel(-1);
-#endif
+ remoting::InitializeIosClient(argc, argv);
@autoreleasepool {
+ RemotingResourceFactory.defaultFactory =
+ [[RemotingResourceFactoryExternal alloc] init];
return UIApplicationMain(
argc, argv, nil, NSStringFromClass([AppDelegate class]));
}

Powered by Google App Engine
This is Rietveld 408576698