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

Side by Side Diff: ios/web_view/internal/criwv_web_main_parts.mm

Issue 2650323002: Cleanup ios/web_view. (Closed)
Patch Set: Created 3 years, 10 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 unified diff | Download patch
OLDNEW
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/criwv_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/path_service.h" 9 #include "base/path_service.h"
9 #include "components/translate/core/browser/translate_download_manager.h" 10 #include "components/translate/core/browser/translate_download_manager.h"
10 #include "ios/web_view/internal/criwv_browser_state.h" 11 #include "ios/web_view/internal/criwv_browser_state.h"
11 #import "ios/web_view/public/criwv_delegate.h" 12 #import "ios/web_view/public/criwv_delegate.h"
12 #include "ui/base/l10n/l10n_util_mac.h" 13 #include "ui/base/l10n/l10n_util_mac.h"
13 #include "ui/base/resource/resource_bundle.h" 14 #include "ui/base/resource/resource_bundle.h"
14 15
15 namespace ios_web_view { 16 namespace ios_web_view {
16 17
17 CRIWVWebMainParts::CRIWVWebMainParts(id<CRIWVDelegate> delegate) { 18 CRIWVWebMainParts::CRIWVWebMainParts(id<CRIWVDelegate> delegate) {
18 delegate_ = delegate; 19 delegate_ = delegate;
19 } 20 }
20 21
21 CRIWVWebMainParts::~CRIWVWebMainParts() {} 22 CRIWVWebMainParts::~CRIWVWebMainParts() {}
22 23
23 void CRIWVWebMainParts::PreMainMessageLoopRun() { 24 void CRIWVWebMainParts::PreMainMessageLoopRun() {
24 // Initialize resources. 25 // Initialize resources.
25 l10n_util::OverrideLocaleWithCocoaLocale(); 26 l10n_util::OverrideLocaleWithCocoaLocale();
26 ui::ResourceBundle::InitSharedInstanceWithLocale( 27 ui::ResourceBundle::InitSharedInstanceWithLocale(
27 "", NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); 28 std::string(), NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
sdefresne 2017/01/25 09:11:09 nit: NULL -> nullptr
michaeldo 2017/01/25 17:23:47 Done.
28 base::FilePath pak_file; 29 base::FilePath pak_file;
29 PathService::Get(base::DIR_MODULE, &pak_file); 30 PathService::Get(base::DIR_MODULE, &pak_file);
30 pak_file = pak_file.Append("web_view_resources.pak"); 31 pak_file = pak_file.Append(FILE_PATH_LITERAL("web_view_resources.pak"));
31 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( 32 ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
32 pak_file, ui::SCALE_FACTOR_NONE); 33 pak_file, ui::SCALE_FACTOR_NONE);
33 34
34 browser_state_.reset(new CRIWVBrowserState); 35 browser_state_ = base::MakeUnique<CRIWVBrowserState>();
35 36
36 // Initialize translate. 37 // Initialize translate.
37 translate::TranslateDownloadManager* download_manager = 38 translate::TranslateDownloadManager* download_manager =
38 translate::TranslateDownloadManager::GetInstance(); 39 translate::TranslateDownloadManager::GetInstance();
39 // TODO(crbug.com/679895): See if we need the system request context here. 40 // TODO(crbug.com/679895): See if we need the system request context here.
40 download_manager->set_request_context(browser_state_->GetRequestContext()); 41 download_manager->set_request_context(browser_state_->GetRequestContext());
41 // TODO(crbug.com/679895): Bring up application locale correctly. 42 // TODO(crbug.com/679895): Bring up application locale correctly.
42 download_manager->set_application_locale(l10n_util::GetLocaleOverride()); 43 download_manager->set_application_locale(l10n_util::GetLocaleOverride());
43 download_manager->language_list()->SetResourceRequestsAllowed(true); 44 download_manager->language_list()->SetResourceRequestsAllowed(true);
44 } 45 }
45 46
46 } // namespace ios_web_view 47 } // namespace ios_web_view
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698