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

Side by Side Diff: chrome/browser/importer/nss_decryptor.cc

Issue 12378016: chrome: Update include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/importer/ie_importer.cc ('k') | chrome/browser/importer/toolbar_importer.cc » ('j') | 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/importer/nss_decryptor.h" 5 #include "chrome/browser/importer/nss_decryptor.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/string_split.h"
13 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/strings/string_split.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "content/public/common/password_form.h" 15 #include "content/public/common/password_form.h"
16 #include "sql/connection.h" 16 #include "sql/connection.h"
17 #include "sql/statement.h" 17 #include "sql/statement.h"
18 18
19 #if defined(USE_NSS) 19 #if defined(USE_NSS)
20 #include <pk11pub.h> 20 #include <pk11pub.h>
21 #include <pk11sdr.h> 21 #include <pk11sdr.h>
22 #endif // defined(USE_NSS) 22 #endif // defined(USE_NSS)
23 23
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 // The user name, password and action. 290 // The user name, password and action.
291 form.username_element = s2.ColumnString16(3); 291 form.username_element = s2.ColumnString16(3);
292 form.username_value = Decrypt(s2.ColumnString(5)); 292 form.username_value = Decrypt(s2.ColumnString(5));
293 form.password_element = s2.ColumnString16(4); 293 form.password_element = s2.ColumnString16(4);
294 form.password_value = Decrypt(s2.ColumnString(6)); 294 form.password_value = Decrypt(s2.ColumnString(6));
295 form.action = GURL(s2.ColumnString(2)).ReplaceComponents(rep); 295 form.action = GURL(s2.ColumnString(2)).ReplaceComponents(rep);
296 forms->push_back(form); 296 forms->push_back(form);
297 } 297 }
298 return true; 298 return true;
299 } 299 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/ie_importer.cc ('k') | chrome/browser/importer/toolbar_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698