| commit | a96d43d4bd51f65d1736887e05b8862a81ec02be | [log] [tgz] |
|---|---|---|
| author | Ran Ji <[email protected]> | Wed May 02 17:14:53 2018 |
| committer | Commit Bot <[email protected]> | Wed May 02 17:14:53 2018 |
| tree | 57fa6228d8569d7a1d9c38bfbe7f719d16e05b74 | |
| parent | 2cf7cc0648b86418544805f9531664d94695daa9 [diff] [blame] |
Load resources.pak earlier in content_main_runner Reland "Load resources.pak earlier in service manager main" This is a reland of 13dfb3270d72c4b826e4f03b8178b22dd81a158f Original change's description: > Load resources.pak earlier in service manager main > > We need to use the content in resources.pak in service manager, but at > that time resource bundle has not been initialized. Create data pack to > load resources.pak and append the data pack to resource bundle during the > initialization. > > Move path FILE_RESOURCES_PACK from chrome_paths.h to ui_base_paths.cc. > > Bug: 729596, 815230 > Change-Id: Iec3a9409cbd9c10775afb72944e66e26650f1181 > Reviewed-on: https://chromium-review.googlesource.com/962679 > Reviewed-by: Yaron Friedman <[email protected]> > Reviewed-by: Ken Rockot <[email protected]> > Reviewed-by: Scott Violet <[email protected]> > Reviewed-by: Xi Han <[email protected]> > Commit-Queue: Ran Ji <[email protected]> > Cr-Commit-Position: refs/heads/master@{#554500} Bug: 729596, 815230 Change-Id: Id963d1e64c70a22a29e94d8186ea0d4bcb1455fd [email protected], [email protected], [email protected] Change-Id: Id963d1e64c70a22a29e94d8186ea0d4bcb1455fd Reviewed-on: https://chromium-review.googlesource.com/1034133 Commit-Queue: Xi Han <[email protected]> Reviewed-by: Xi Han <[email protected]> Cr-Commit-Position: refs/heads/master@{#555443}
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h index 0aea1165..cfbdda6 100644 --- a/chrome/browser/chrome_browser_main_linux.h +++ b/chrome/browser/chrome_browser_main_linux.h
@@ -14,7 +14,8 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix { public: explicit ChromeBrowserMainPartsLinux( - const content::MainFunctionParams& parameters); + const content::MainFunctionParams& parameters, + std::unique_ptr<ui::DataPack> data_pack); ~ChromeBrowserMainPartsLinux() override; // ChromeBrowserMainParts overrides.