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

Side by Side Diff: chrome/common/importer/ie_importer_utils_win.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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/usb/usb_device_handle.cc ('k') | chrome/renderer/pepper/ppb_pdf_impl.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/common/importer/ie_importer_utils_win.h" 5 #include "chrome/common/importer/ie_importer_utils_win.h"
6 6
7 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h" 7 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h"
8 8
9 namespace { 9 namespace {
10 10
11 const char16 kIEFavoritesOrderKey[] = 11 const base::char16 kIEFavoritesOrderKey[] =
12 L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\" 12 L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\"
13 L"MenuOrder\\Favorites"; 13 L"MenuOrder\\Favorites";
14 14
15 const char16 kIEStorage2Key[] = 15 const base::char16 kIEStorage2Key[] =
16 L"Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2"; 16 L"Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2";
17 17
18 const char16 kIESettingsMainKey[] = 18 const base::char16 kIESettingsMainKey[] =
19 L"Software\\Microsoft\\Internet Explorer\\Main"; 19 L"Software\\Microsoft\\Internet Explorer\\Main";
20 20
21 base::string16 GetPotentiallyOverridenIEKey( 21 base::string16 GetPotentiallyOverridenIEKey(
22 const base::string16& desired_key_path) { 22 const base::string16& desired_key_path) {
23 base::string16 test_reg_override( 23 base::string16 test_reg_override(
24 IEImporterTestRegistryOverrider::GetTestRegistryOverride()); 24 IEImporterTestRegistryOverrider::GetTestRegistryOverride());
25 return test_reg_override.empty() ? desired_key_path : test_reg_override; 25 return test_reg_override.empty() ? desired_key_path : test_reg_override;
26 } 26 }
27 27
28 } // namespace 28 } // namespace
(...skipping 10 matching lines...) Expand all
39 return GetPotentiallyOverridenIEKey(kIEStorage2Key); 39 return GetPotentiallyOverridenIEKey(kIEStorage2Key);
40 } 40 }
41 41
42 base::string16 GetIESettingsKey() { 42 base::string16 GetIESettingsKey() {
43 // Return kIESettingsMainKey unless an override has been set for tests. 43 // Return kIESettingsMainKey unless an override has been set for tests.
44 return GetPotentiallyOverridenIEKey(kIESettingsMainKey); 44 return GetPotentiallyOverridenIEKey(kIESettingsMainKey);
45 } 45 }
46 46
47 } // namespace importer 47 } // namespace importer
48 48
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_device_handle.cc ('k') | chrome/renderer/pepper/ppb_pdf_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698