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

Side by Side Diff: chrome/browser/chrome_browser_main_linux.cc

Issue 2150543002: OSCrypt supports encryption with KWallet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_browser_main_linux.h" 5 #include "chrome/browser/chrome_browser_main_linux.h"
6 6
7 #include <fontconfig/fontconfig.h> 7 #include <fontconfig/fontconfig.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 content::BrowserThread::PostBlockingPoolTask( 51 content::BrowserThread::PostBlockingPoolTask(
52 FROM_HERE, 52 FROM_HERE,
53 base::Bind(base::IgnoreResult(&base::GetLinuxDistro))); 53 base::Bind(base::IgnoreResult(&base::GetLinuxDistro)));
54 #endif 54 #endif
55 55
56 media::AudioManager::SetGlobalAppName( 56 media::AudioManager::SetGlobalAppName(
57 l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME)); 57 l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME));
58 58
59 #if !defined(OS_CHROMEOS) 59 #if !defined(OS_CHROMEOS)
60 // Forward to os_crypt the flag to use a specific password store. 60 // Forward to os_crypt the flag to use a specific password store.
61 std::string password_store = 61 OSCrypt::SetStore(
62 parsed_command_line().GetSwitchValueASCII(switches::kPasswordStore); 62 parsed_command_line().GetSwitchValueASCII(switches::kPasswordStore));
63 OSCrypt::SetStore(password_store); 63 // Forward the product name
64 OSCrypt::SetProductName(l10n_util::GetStringUTF8(IDS_PRODUCT_NAME));
64 #endif 65 #endif
65 66
66 ChromeBrowserMainPartsPosix::PreProfileInit(); 67 ChromeBrowserMainPartsPosix::PreProfileInit();
67 } 68 }
68 69
69 void ChromeBrowserMainPartsLinux::PostProfileInit() { 70 void ChromeBrowserMainPartsLinux::PostProfileInit() {
70 ChromeBrowserMainPartsPosix::PostProfileInit(); 71 ChromeBrowserMainPartsPosix::PostProfileInit();
71 72
72 g_browser_process->metrics_service()->RecordBreakpadRegistration( 73 g_browser_process->metrics_service()->RecordBreakpadRegistration(
73 breakpad::IsCrashReporterEnabled()); 74 breakpad::IsCrashReporterEnabled());
(...skipping 10 matching lines...) Expand all
84 } 85 }
85 86
86 void ChromeBrowserMainPartsLinux::PostDestroyThreads() { 87 void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
87 #if !defined(OS_CHROMEOS) 88 #if !defined(OS_CHROMEOS)
88 bluez::BluezDBusManager::Shutdown(); 89 bluez::BluezDBusManager::Shutdown();
89 bluez::DBusThreadManagerLinux::Shutdown(); 90 bluez::DBusThreadManagerLinux::Shutdown();
90 #endif 91 #endif
91 92
92 ChromeBrowserMainPartsPosix::PostDestroyThreads(); 93 ChromeBrowserMainPartsPosix::PostDestroyThreads();
93 } 94 }
OLDNEW
« no previous file with comments | « no previous file | components/components_tests.gyp » ('j') | components/os_crypt/key_storage_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698