Index: chrome/browser/chrome_browser_main_linux.cc |
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc |
index 37bcc4c0400993ef582e1e2950f57123abc076e3..fe95885568a4a860ace1878b2b45cba94c7adb65 100644 |
--- a/chrome/browser/chrome_browser_main_linux.cc |
+++ b/chrome/browser/chrome_browser_main_linux.cc |
@@ -6,6 +6,8 @@ |
#include <fontconfig/fontconfig.h> |
+#include <string> |
+ |
#include "build/build_config.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/grit/chromium_strings.h" |
@@ -17,7 +19,10 @@ |
#include "ui/base/l10n/l10n_util.h" |
#if !defined(OS_CHROMEOS) |
+#include "base/command_line.h" |
#include "base/linux_util.h" |
+#include "chrome/common/chrome_switches.h" |
+#include "components/os_crypt/os_crypt.h" |
#include "content/public/browser/browser_thread.h" |
#endif |
@@ -51,6 +56,13 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { |
media::AudioManager::SetGlobalAppName( |
l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME)); |
+#if !defined(OS_CHROMEOS) |
+ // Forward to os_crypt the flag to use a specific password store. |
+ std::string password_store = |
+ parsed_command_line().GetSwitchValueASCII(switches::kPasswordStore); |
+ OSCrypt::SetStore(password_store); |
+#endif |
+ |
ChromeBrowserMainPartsPosix::PreProfileInit(); |
} |