Chromium Code Reviews| Index: ios/web_view/internal/criwv_web_main_parts.mm |
| diff --git a/ios/web_view/internal/criwv_web_main_parts.mm b/ios/web_view/internal/criwv_web_main_parts.mm |
| index 7465a08331c36afb7378599bc1ebcb244768c7da..731847aba3ee56586dfbad3b31be748437043326 100644 |
| --- a/ios/web_view/internal/criwv_web_main_parts.mm |
| +++ b/ios/web_view/internal/criwv_web_main_parts.mm |
| @@ -5,6 +5,7 @@ |
| #import "ios/web_view/internal/criwv_web_main_parts.h" |
| #include "base/base_paths.h" |
| +#include "base/memory/ptr_util.h" |
| #include "base/path_service.h" |
| #include "components/translate/core/browser/translate_download_manager.h" |
| #include "ios/web_view/internal/criwv_browser_state.h" |
| @@ -24,14 +25,14 @@ void CRIWVWebMainParts::PreMainMessageLoopRun() { |
| // Initialize resources. |
| l10n_util::OverrideLocaleWithCocoaLocale(); |
| ui::ResourceBundle::InitSharedInstanceWithLocale( |
| - "", NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES); |
| + 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.
|
| base::FilePath pak_file; |
| PathService::Get(base::DIR_MODULE, &pak_file); |
| - pak_file = pak_file.Append("web_view_resources.pak"); |
| + pak_file = pak_file.Append(FILE_PATH_LITERAL("web_view_resources.pak")); |
| ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
| pak_file, ui::SCALE_FACTOR_NONE); |
| - browser_state_.reset(new CRIWVBrowserState); |
| + browser_state_ = base::MakeUnique<CRIWVBrowserState>(); |
| // Initialize translate. |
| translate::TranslateDownloadManager* download_manager = |