Index: ios/web_view/internal/web_view_web_main_parts.mm |
diff --git a/ios/web_view/internal/web_view_web_main_parts.mm b/ios/web_view/internal/web_view_web_main_parts.mm |
index 67218afe0a6b1b22d86720341b180db748916461..4f1a11970a420f40501a1e5e898244736d9a38f5 100644 |
--- a/ios/web_view/internal/web_view_web_main_parts.mm |
+++ b/ios/web_view/internal/web_view_web_main_parts.mm |
@@ -4,11 +4,10 @@ |
#import "ios/web_view/internal/web_view_web_main_parts.h" |
-#import <Foundation/Foundation.h> |
- |
#include "base/base_paths.h" |
-#include "base/memory/ptr_util.h" |
#include "base/path_service.h" |
+#include "ios/web_view/internal/app/application_context.h" |
+#include "ios/web_view/internal/translate/web_view_translate_service.h" |
#include "ui/base/l10n/l10n_util_mac.h" |
#include "ui/base/resource/resource_bundle.h" |
@@ -22,11 +21,11 @@ WebViewWebMainParts::WebViewWebMainParts() {} |
WebViewWebMainParts::~WebViewWebMainParts() = default; |
-void WebViewWebMainParts::PreMainMessageLoopRun() { |
- // Initialize resources. |
+void WebViewWebMainParts::PreMainMessageLoopStart() { |
l10n_util::OverrideLocaleWithCocoaLocale(); |
ui::ResourceBundle::InitSharedInstanceWithLocale( |
std::string(), nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); |
+ |
base::FilePath pak_file; |
PathService::Get(base::DIR_MODULE, &pak_file); |
pak_file = pak_file.Append(FILE_PATH_LITERAL("web_view_resources.pak")); |
@@ -34,4 +33,24 @@ void WebViewWebMainParts::PreMainMessageLoopRun() { |
pak_file, ui::SCALE_FACTOR_NONE); |
} |
+void WebViewWebMainParts::PreCreateThreads() { |
+ // Initialize local state. |
+ DCHECK(ApplicationContext::GetInstance()->GetLocalState()); |
sdefresne
2017/06/01 08:36:53
Code in DCHECK is not invoked in official builds.
michaeldo
2017/06/01 21:20:38
Thank you for catching this! Done.
|
+ |
+ ApplicationContext::GetInstance()->PreCreateThreads(); |
+} |
+ |
+void WebViewWebMainParts::PreMainMessageLoopRun() { |
+ WebViewTranslateService::GetInstance()->Initialize(); |
+} |
+ |
+void WebViewWebMainParts::PostMainMessageLoopRun() { |
+ WebViewTranslateService::GetInstance()->Shutdown(); |
+ ApplicationContext::GetInstance()->SaveState(); |
+} |
+ |
+void WebViewWebMainParts::PostDestroyThreads() { |
+ ApplicationContext::GetInstance()->PostDestroyThreads(); |
+} |
+ |
} // namespace ios_web_view |