OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "ios/web_view/internal/criwv_web_main_parts.h" | 5 #import "ios/web_view/internal/web_view_web_main_parts.h" |
6 | 6 |
7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "components/translate/core/browser/translate_download_manager.h" | 10 #include "components/translate/core/browser/translate_download_manager.h" |
11 #include "ios/web_view/internal/criwv_browser_state.h" | 11 #include "ios/web_view/internal/web_view_browser_state.h" |
12 #import "ios/web_view/public/cwv_delegate.h" | 12 #import "ios/web_view/public/cwv_delegate.h" |
13 #include "ui/base/l10n/l10n_util_mac.h" | 13 #include "ui/base/l10n/l10n_util_mac.h" |
14 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
15 | 15 |
16 #if !defined(__has_feature) || !__has_feature(objc_arc) | 16 #if !defined(__has_feature) || !__has_feature(objc_arc) |
17 #error "This file requires ARC support." | 17 #error "This file requires ARC support." |
18 #endif | 18 #endif |
19 | 19 |
20 namespace ios_web_view { | 20 namespace ios_web_view { |
21 | 21 |
22 CRIWVWebMainParts::CRIWVWebMainParts(id<CWVDelegate> delegate) { | 22 WebViewWebMainParts::WebViewWebMainParts(id<CWVDelegate> delegate) { |
23 delegate_ = delegate; | 23 delegate_ = delegate; |
24 } | 24 } |
25 | 25 |
26 CRIWVWebMainParts::~CRIWVWebMainParts() {} | 26 WebViewWebMainParts::~WebViewWebMainParts() {} |
Eugene But (OOO till 7-30)
2017/02/25 01:29:29
Optional nit:
WebViewWebMainParts::~WebViewWebMain
michaeldo
2017/02/25 07:41:12
Done.
| |
27 | 27 |
28 void CRIWVWebMainParts::PreMainMessageLoopRun() { | 28 void WebViewWebMainParts::PreMainMessageLoopRun() { |
29 // Initialize resources. | 29 // Initialize resources. |
30 l10n_util::OverrideLocaleWithCocoaLocale(); | 30 l10n_util::OverrideLocaleWithCocoaLocale(); |
31 ui::ResourceBundle::InitSharedInstanceWithLocale( | 31 ui::ResourceBundle::InitSharedInstanceWithLocale( |
32 std::string(), nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); | 32 std::string(), nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); |
33 base::FilePath pak_file; | 33 base::FilePath pak_file; |
34 PathService::Get(base::DIR_MODULE, &pak_file); | 34 PathService::Get(base::DIR_MODULE, &pak_file); |
35 pak_file = pak_file.Append(FILE_PATH_LITERAL("web_view_resources.pak")); | 35 pak_file = pak_file.Append(FILE_PATH_LITERAL("web_view_resources.pak")); |
36 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( | 36 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
37 pak_file, ui::SCALE_FACTOR_NONE); | 37 pak_file, ui::SCALE_FACTOR_NONE); |
38 | 38 |
39 browser_state_ = base::MakeUnique<CRIWVBrowserState>(false); | 39 browser_state_ = base::MakeUnique<WebViewBrowserState>(false); |
40 off_the_record_browser_state_ = base::MakeUnique<CRIWVBrowserState>(true); | 40 off_the_record_browser_state_ = base::MakeUnique<WebViewBrowserState>(true); |
41 | 41 |
42 // Initialize translate. | 42 // Initialize translate. |
43 translate::TranslateDownloadManager* download_manager = | 43 translate::TranslateDownloadManager* download_manager = |
44 translate::TranslateDownloadManager::GetInstance(); | 44 translate::TranslateDownloadManager::GetInstance(); |
45 // TODO(crbug.com/679895): See if we need the system request context here. | 45 // TODO(crbug.com/679895): See if we need the system request context here. |
46 download_manager->set_request_context(browser_state_->GetRequestContext()); | 46 download_manager->set_request_context(browser_state_->GetRequestContext()); |
47 // TODO(crbug.com/679895): Bring up application locale correctly. | 47 // TODO(crbug.com/679895): Bring up application locale correctly. |
48 download_manager->set_application_locale(l10n_util::GetLocaleOverride()); | 48 download_manager->set_application_locale(l10n_util::GetLocaleOverride()); |
49 download_manager->language_list()->SetResourceRequestsAllowed(true); | 49 download_manager->language_list()->SetResourceRequestsAllowed(true); |
50 } | 50 } |
51 | 51 |
52 } // namespace ios_web_view | 52 } // namespace ios_web_view |
OLD | NEW |