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

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

Issue 113169: Move win_util.h from common to app. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/firefox_importer_utils.h" 5 #include "chrome/browser/importer/firefox_importer_utils.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include <shlobj.h> 10 #include <shlobj.h>
11
12 #include "app/win_util.h"
13 #include "base/registry.h"
11 #endif 14 #endif
12
13 #include "base/file_util.h" 15 #include "base/file_util.h"
14 #include "base/logging.h" 16 #include "base/logging.h"
15 #include "base/string_util.h" 17 #include "base/string_util.h"
16 #include "base/sys_string_conversions.h" 18 #include "base/sys_string_conversions.h"
17 #include "chrome/browser/search_engines/template_url.h" 19 #include "chrome/browser/search_engines/template_url.h"
18 #include "chrome/browser/search_engines/template_url_model.h" 20 #include "chrome/browser/search_engines/template_url_model.h"
19 #include "chrome/browser/search_engines/template_url_parser.h" 21 #include "chrome/browser/search_engines/template_url_parser.h"
20 #include "googleurl/src/gurl.h" 22 #include "googleurl/src/gurl.h"
21 #include "net/base/base64.h" 23 #include "net/base/base64.h"
22 24
23 #if defined(OS_WIN)
24 #include "base/registry.h"
25 #include "chrome/common/win_util.h"
26 #endif
27 25
28 namespace { 26 namespace {
29 27
30 #if defined(OS_WIN) 28 #if defined(OS_WIN)
31 // NOTE: Keep these in order since we need test all those paths according 29 // NOTE: Keep these in order since we need test all those paths according
32 // to priority. For example. One machine has multiple users. One non-admin 30 // to priority. For example. One machine has multiple users. One non-admin
33 // user installs Firefox 2, which causes there is a Firefox2 entry under HKCU. 31 // user installs Firefox 2, which causes there is a Firefox2 entry under HKCU.
34 // One admin user installs Firefox 3, which causes there is a Firefox 3 entry 32 // One admin user installs Firefox 3, which causes there is a Firefox 3 entry
35 // under HKLM. So when the non-admin user log in, we should deal with Firefox 2 33 // under HKLM. So when the non-admin user log in, we should deal with Firefox 2
36 // related data instead of Firefox 3. 34 // related data instead of Firefox 3.
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 } 766 }
769 // Version 3 has an extra line for further use. 767 // Version 3 has an extra line for further use.
770 if (version == 3) { 768 if (version == 3) {
771 ++begin; 769 ++begin;
772 } 770 }
773 771
774 forms->push_back(form); 772 forms->push_back(form);
775 } 773 }
776 } 774 }
777 } 775 }
OLDNEW
« no previous file with comments | « chrome/browser/hang_monitor/hung_plugin_action.cc ('k') | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698