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

Side by Side Diff: chrome/browser/password_manager/native_backend_kwallet_x.cc

Issue 2090343002: Fix build error with gcc 4.9.3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/password_manager/native_backend_kwallet_x.h" 5 #include "chrome/browser/password_manager/native_backend_kwallet_x.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 // Get the wallet name. 381 // Get the wallet name.
382 error = kwallet_dbus_.NetworkWallet(&wallet_name_); 382 error = kwallet_dbus_.NetworkWallet(&wallet_name_);
383 switch (error) { 383 switch (error) {
384 case KWalletDBus::Error::CANNOT_CONTACT: 384 case KWalletDBus::Error::CANNOT_CONTACT:
385 return TEMPORARY_FAIL; 385 return TEMPORARY_FAIL;
386 case KWalletDBus::Error::CANNOT_READ: 386 case KWalletDBus::Error::CANNOT_READ:
387 return PERMANENT_FAIL; 387 return PERMANENT_FAIL;
388 case KWalletDBus::Error::SUCCESS: 388 case KWalletDBus::Error::SUCCESS:
389 return INIT_SUCCESS; 389 return INIT_SUCCESS;
390 } 390 }
391
392 NOTREACHED();
393 return PERMANENT_FAIL;
391 } 394 }
392 395
393 password_manager::PasswordStoreChangeList NativeBackendKWallet::AddLogin( 396 password_manager::PasswordStoreChangeList NativeBackendKWallet::AddLogin(
394 const PasswordForm& form) { 397 const PasswordForm& form) {
395 int wallet_handle = WalletHandle(); 398 int wallet_handle = WalletHandle();
396 if (wallet_handle == kInvalidKWalletHandle) 399 if (wallet_handle == kInvalidKWalletHandle)
397 return password_manager::PasswordStoreChangeList(); 400 return password_manager::PasswordStoreChangeList();
398 401
399 ScopedVector<autofill::PasswordForm> forms; 402 ScopedVector<autofill::PasswordForm> forms;
400 if (!GetLoginsList(form.signon_realm, wallet_handle, &forms)) 403 if (!GetLoginsList(form.signon_realm, wallet_handle, &forms))
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 } 826 }
824 827
825 return handle; 828 return handle;
826 } 829 }
827 830
828 std::string NativeBackendKWallet::GetProfileSpecificFolderName() const { 831 std::string NativeBackendKWallet::GetProfileSpecificFolderName() const {
829 // Originally, the folder name was always just "Chrome Form Data". 832 // Originally, the folder name was always just "Chrome Form Data".
830 // Now we use it to distinguish passwords for different profiles. 833 // Now we use it to distinguish passwords for different profiles.
831 return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_); 834 return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_);
832 } 835 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698