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

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

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/ie_importer.h" 5 #include "chrome/browser/importer/ie_importer.h"
6 6
7 #include <ole2.h> 7 #include <ole2.h>
8 #include <intshcut.h> 8 #include <intshcut.h>
9 #include <pstore.h> 9 #include <pstore.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
11 #include <urlhist.h> 11 #include <urlhist.h>
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <map> 14 #include <map>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "app/l10n_util.h" 18 #include "app/l10n_util.h"
19 #include "app/win_util.h" 19 #include "app/win_util.h"
20 #include "base/file_path.h" 20 #include "base/file_path.h"
21 #include "base/file_util.h" 21 #include "base/file_util.h"
22 #include "base/registry.h" 22 #include "base/registry.h"
23 #include "base/scoped_comptr_win.h" 23 #include "base/scoped_comptr_win.h"
24 #include "base/string_split.h"
24 #include "base/string_util.h" 25 #include "base/string_util.h"
25 #include "base/time.h" 26 #include "base/time.h"
26 #include "base/values.h" 27 #include "base/values.h"
27 #include "base/utf_string_conversions.h" 28 #include "base/utf_string_conversions.h"
28 #include "base/win_util.h" 29 #include "base/win_util.h"
29 #include "chrome/browser/bookmarks/bookmark_model.h" 30 #include "chrome/browser/bookmarks/bookmark_model.h"
30 #include "chrome/browser/importer/importer_bridge.h" 31 #include "chrome/browser/importer/importer_bridge.h"
31 #include "chrome/browser/importer/importer_data_types.h" 32 #include "chrome/browser/importer/importer_data_types.h"
32 #include "chrome/browser/password_manager/ie7_password.h" 33 #include "chrome/browser/password_manager/ie7_password.h"
33 #include "chrome/browser/search_engines/template_url.h" 34 #include "chrome/browser/search_engines/template_url.h"
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 if (version < 0) { 576 if (version < 0) {
576 wchar_t buffer[128]; 577 wchar_t buffer[128];
577 DWORD buffer_length = sizeof(buffer); 578 DWORD buffer_length = sizeof(buffer);
578 RegKey reg_key(HKEY_LOCAL_MACHINE, 579 RegKey reg_key(HKEY_LOCAL_MACHINE,
579 L"Software\\Microsoft\\Internet Explorer", KEY_READ); 580 L"Software\\Microsoft\\Internet Explorer", KEY_READ);
580 bool result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL); 581 bool result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
581 version = (result ? _wtoi(buffer) : 0); 582 version = (result ? _wtoi(buffer) : 0);
582 } 583 }
583 return version; 584 return version;
584 } 585 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/firefox_importer_utils.cc ('k') | chrome/browser/importer/nss_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698