diff options
| author | brettw <brettw@chromium.org> | 2015-05-01 10:43:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 17:44:29 +0000 |
| commit | eb1f7acfd8fb07bf5ed25fdc96c935f76e65148e (patch) | |
| tree | dcf7fc6f0c8806cce37c13411c0f7b0f774f5a8e /chrome/installer/setup | |
| parent | 1e033036c2951fabb4857c920ed5de43b87e1434 (diff) | |
| download | chromium_src-eb1f7acfd8fb07bf5ed25fdc96c935f76e65148e.zip chromium_src-eb1f7acfd8fb07bf5ed25fdc96c935f76e65148e.tar.gz chromium_src-eb1f7acfd8fb07bf5ed25fdc96c935f76e65148e.tar.bz2 | |
Add installer_util_unittests to the GN windows build
This fixes some C++ Warnings on Windows to avoid having to add suppressions to the GN build.
Moves the generated strings header to the same place in the gen tree as it is in the source tree. Update includes.
Previously landed https://codereview.chromium.org/1062743006/
TBR=scottmg@chromium.org
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
Review URL: https://codereview.chromium.org/1116293002
Cr-Commit-Position: refs/heads/master@{#327929}
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/app_launcher_installer.cc | 3 | ||||
| -rw-r--r-- | chrome/installer/setup/setup_main.cc | 3 | ||||
| -rw-r--r-- | chrome/installer/setup/setup_unittests.rc | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/chrome/installer/setup/app_launcher_installer.cc b/chrome/installer/setup/app_launcher_installer.cc index 3c30aaf..46670fa 100644 --- a/chrome/installer/setup/app_launcher_installer.cc +++ b/chrome/installer/setup/app_launcher_installer.cc @@ -13,14 +13,13 @@ #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/installer_state.h" +#include "chrome/installer/util/installer_util_strings.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/product.h" #include "chrome/installer/util/updating_app_registration_data.h" #include "chrome/installer/util/work_item.h" #include "chrome/installer/util/work_item_list.h" -#include "installer_util_strings.h" // NOLINT - namespace installer { namespace { diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index acc35d7..d50aa1e 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -56,6 +56,7 @@ #include "chrome/installer/util/installation_state.h" #include "chrome/installer/util/installation_validator.h" #include "chrome/installer/util/installer_state.h" +#include "chrome/installer/util/installer_util_strings.h" #include "chrome/installer/util/l10n_string_util.h" #include "chrome/installer/util/logging_installer.h" #include "chrome/installer/util/lzma_util.h" @@ -65,8 +66,6 @@ #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/user_experiment.h" -#include "installer_util_strings.h" // NOLINT - #if defined(GOOGLE_CHROME_BUILD) #include "chrome/installer/util/updating_app_registration_data.h" #endif diff --git a/chrome/installer/setup/setup_unittests.rc b/chrome/installer/setup/setup_unittests.rc index 67c1959..4fd7dd5 100644 --- a/chrome/installer/setup/setup_unittests.rc +++ b/chrome/installer/setup/setup_unittests.rc @@ -55,7 +55,7 @@ END // // String Table // -#include "installer_util_strings.rc" +#include "chrome/installer/util/installer_util_strings.rc" #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// |