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

Unified Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 2948783002: Create setting that disables password stores (Closed)
Patch Set: nits + tests Created 3 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 | chrome/browser/password_manager/password_store_factory.cc » ('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 1fc00fa7e9ae8abb42851cba1e9fdcfb2736fd71..52e0aadca27a8f95344033cbb6bb392b895d7cb0 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -8,6 +8,7 @@
#include <string>
+#include "base/files/file_path.h"
#include "base/single_thread_task_runner.h"
#include "base/task_scheduler/post_task.h"
#include "build/build_config.h"
@@ -23,6 +24,7 @@
#if !defined(OS_CHROMEOS)
#include "base/command_line.h"
#include "base/linux_util.h"
+#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/chrome_switches.h"
#include "components/os_crypt/os_crypt.h"
#include "content/public/browser/browser_thread.h"
@@ -69,6 +71,12 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
content::BrowserThread::GetTaskRunnerForThread(
content::BrowserThread::UI));
OSCrypt::SetMainThreadRunner(main_thread_runner);
+ // OSCrypt can be disabled in a special settings file.
+ OSCrypt::ShouldUsePreference(
+ parsed_command_line().HasSwitch(switches::kEnableEncryptionSelection));
+ base::FilePath user_data_dir;
+ chrome::GetDefaultUserDataDirectory(&user_data_dir);
+ OSCrypt::SetUserDataPath(user_data_dir);
#endif
ChromeBrowserMainPartsPosix::PreProfileInit();
« no previous file with comments | « no previous file | chrome/browser/password_manager/password_store_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698