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

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

Issue 2106015: Move data types used in the importer process to common/, in preparation for i... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 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/firefox3_importer.h ('k') | chrome/browser/importer/importer.h » ('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) 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_util.h" 24 #include "base/string_util.h"
25 #include "base/time.h" 25 #include "base/time.h"
26 #include "base/win_util.h" 26 #include "base/win_util.h"
27 #include "chrome/browser/bookmarks/bookmark_model.h" 27 #include "chrome/browser/bookmarks/bookmark_model.h"
28 #include "chrome/browser/importer/importer_bridge.h" 28 #include "chrome/browser/importer/importer_bridge.h"
29 #include "chrome/browser/importer/importer_data_types.h" 29 #include "chrome/common/importer_data_types.h"
30 #include "chrome/browser/password_manager/ie7_password.h" 30 #include "chrome/browser/password_manager/ie7_password.h"
31 #include "chrome/browser/search_engines/template_url_model.h" 31 #include "chrome/browser/search_engines/template_url_model.h"
32 #include "chrome/common/time_format.h" 32 #include "chrome/common/time_format.h"
33 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
34 #include "googleurl/src/gurl.h" 34 #include "googleurl/src/gurl.h"
35 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
36 #include "webkit/glue/password_form.h" 36 #include "webkit/glue/password_form.h"
37 37
38 using base::Time; 38 using base::Time;
39 using webkit_glue::PasswordForm; 39 using webkit_glue::PasswordForm;
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 if (version < 0) { 568 if (version < 0) {
569 wchar_t buffer[128]; 569 wchar_t buffer[128];
570 DWORD buffer_length = sizeof(buffer); 570 DWORD buffer_length = sizeof(buffer);
571 bool result = ReadFromRegistry(HKEY_LOCAL_MACHINE, 571 bool result = ReadFromRegistry(HKEY_LOCAL_MACHINE,
572 L"Software\\Microsoft\\Internet Explorer", 572 L"Software\\Microsoft\\Internet Explorer",
573 L"Version", buffer, &buffer_length); 573 L"Version", buffer, &buffer_length);
574 version = (result ? _wtoi(buffer) : 0); 574 version = (result ? _wtoi(buffer) : 0);
575 } 575 }
576 return version; 576 return version;
577 } 577 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/firefox3_importer.h ('k') | chrome/browser/importer/importer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698