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

Unified Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 2159743002: Forward --password-store switch to os_crypt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/components_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « no previous file | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698