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

Unified Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 2152493002: Revert of Forward password-store switch to OSCrypt component (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 d45ee7984d9193d48124bb23796b223181da1eb9..37bcc4c0400993ef582e1e2950f57123abc076e3 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -5,8 +5,6 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#include <fontconfig/fontconfig.h>
-
-#include <string>
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
@@ -19,10 +17,7 @@
#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
@@ -64,13 +59,6 @@
g_browser_process->metrics_service()->RecordBreakpadRegistration(
breakpad::IsCrashReporterEnabled());
-
-#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
}
void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() {
« 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