diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 22:38:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-08 22:38:41 +0000 |
| commit | 3ea1b18715919a522c6711e5ca5f2fd40e485850 (patch) | |
| tree | e17d17820edba1ce729fbe9948a23b498bfe1286 /chrome/installer/gcapi | |
| parent | 5ffc16b6a8ab99e5470cd23645fd3a12a04c6a0e (diff) | |
| download | chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.zip chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.gz chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.bz2 | |
Rename FilePath to base::FilePath and use new location of string_number_conversions in some chrome subdirectories.
Review URL: https://codereview.chromium.org/12218065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/gcapi')
| -rw-r--r-- | chrome/installer/gcapi/gcapi.cc | 4 | ||||
| -rw-r--r-- | chrome/installer/gcapi/gcapi_last_run_test.cc | 2 | ||||
| -rw-r--r-- | chrome/installer/gcapi/gcapi_reactivation_test.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc index 4087ac0..d99ea8f 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -12,9 +12,9 @@ #include <sddl.h> #define STRSAFE_NO_DEPRECATE +#include <windows.h> #include <strsafe.h> #include <tlhelp32.h> -#include <windows.h> #include <cstdlib> #include <iterator> @@ -28,8 +28,8 @@ #include "base/file_util.h" #include "base/process_util.h" #include "base/string16.h" -#include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/string_number_conversions.h" #include "base/time.h" #include "base/win/registry.h" #include "base/win/scoped_com_initializer.h" diff --git a/chrome/installer/gcapi/gcapi_last_run_test.cc b/chrome/installer/gcapi/gcapi_last_run_test.cc index b2e330a..79fd835 100644 --- a/chrome/installer/gcapi/gcapi_last_run_test.cc +++ b/chrome/installer/gcapi/gcapi_last_run_test.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/guid.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/test/test_reg_util_win.h" #include "base/time.h" #include "base/utf_string_conversions.h" diff --git a/chrome/installer/gcapi/gcapi_reactivation_test.cc b/chrome/installer/gcapi/gcapi_reactivation_test.cc index 7f4a142..e8cc34d 100644 --- a/chrome/installer/gcapi/gcapi_reactivation_test.cc +++ b/chrome/installer/gcapi/gcapi_reactivation_test.cc @@ -6,8 +6,8 @@ #include "base/basictypes.h" #include "base/guid.h" -#include "base/string_number_conversions.h" #include "base/stringprintf.h" +#include "base/strings/string_number_conversions.h" #include "base/test/test_reg_util_win.h" #include "base/time.h" #include "base/utf_string_conversions.h" |