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

Unified Diff: ios/showcase/core/app_delegate.mm

Issue 2651833002: [ios showcase]Configures Resource Bundle and adds Toolbar Coordinator (Closed)
Patch Set: Removes Application State dependency Created 3 years, 11 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: ios/showcase/core/app_delegate.mm
diff --git a/ios/showcase/core/app_delegate.mm b/ios/showcase/core/app_delegate.mm
index fda5403304f46f7c728ab057675a3296453a1808..ecb4eb6481d643cf275329da82e1d138b8db3f69 100644
--- a/ios/showcase/core/app_delegate.mm
+++ b/ios/showcase/core/app_delegate.mm
@@ -4,11 +4,14 @@
#import "ios/showcase/core/app_delegate.h"
+#include "base/memory/ptr_util.h"
+#include "ios/chrome/app/startup/ios_chrome_main.h"
#import "ios/showcase/core/showcase_model.h"
#import "ios/showcase/core/showcase_view_controller.h"
#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
#import "ios/third_party/material_roboto_font_loader_ios/src/src/MDCTypographyAdditions/MDFRobotoFontLoader+MDCTypographyAdditions.h"
#import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
+#include "ui/base/resource/resource_bundle.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
@@ -27,6 +30,11 @@
initWithRootViewController:viewController];
self.window.rootViewController = navigationController;
[self.window makeKeyAndVisible];
+
+ base::MakeUnique<IOSChromeMain>();
+ ResourceBundle::InitSharedInstanceWithLocale(
+ std::string(), nullptr, ResourceBundle::LOAD_COMMON_RESOURCES);
lpromero 2017/01/25 08:07:30 Can you move this before or right after the MDCTyp
sczs 2017/01/25 16:59:21 Done.
+
return YES;
}
« no previous file with comments | « ios/showcase/core/BUILD.gn ('k') | ios/showcase/core/main.mm » ('j') | ios/showcase/core/main.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698