diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 08:28:30 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 08:29:53 +0000 |
| commit | 5ec0d4fd9a973f16767dcb7058c749e413734a64 (patch) | |
| tree | f652c35dd80897d149ef4b226d791491a0ff7d08 /chrome/common/net | |
| parent | 9c82b547c92959aadd309fc80d4419970571de33 (diff) | |
| download | chromium_src-5ec0d4fd9a973f16767dcb7058c749e413734a64.zip chromium_src-5ec0d4fd9a973f16767dcb7058c749e413734a64.tar.gz chromium_src-5ec0d4fd9a973f16767dcb7058c749e413734a64.tar.bz2 | |
Use a qualified path for grit includes in various chrome/ directories.
BUG=401588
Review URL: https://codereview.chromium.org/450053003
Cr-Commit-Position: refs/heads/master@{#289213}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/net')
| -rw-r--r-- | chrome/common/net/net_resource_provider.cc | 6 | ||||
| -rw-r--r-- | chrome/common/net/x509_certificate_model.cc | 2 | ||||
| -rw-r--r-- | chrome/common/net/x509_certificate_model_openssl.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/common/net/net_resource_provider.cc b/chrome/common/net/net_resource_provider.cc index ee0b9b2..97f4619 100644 --- a/chrome/common/net/net_resource_provider.cc +++ b/chrome/common/net/net_resource_provider.cc @@ -9,9 +9,9 @@ #include "base/i18n/rtl.h" #include "base/strings/string_piece.h" #include "base/values.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" -#include "grit/net_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" +#include "net/grit/net_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/common/net/x509_certificate_model.cc b/chrome/common/net/x509_certificate_model.cc index bfc1192..a7bb46c 100644 --- a/chrome/common/net/x509_certificate_model.cc +++ b/chrome/common/net/x509_certificate_model.cc @@ -9,7 +9,7 @@ #include <algorithm> #include "base/strings/utf_string_conversions.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/net/x509_certificate_model_openssl.cc b/chrome/common/net/x509_certificate_model_openssl.cc index d51c036..c553afe 100644 --- a/chrome/common/net/x509_certificate_model_openssl.cc +++ b/chrome/common/net/x509_certificate_model_openssl.cc @@ -16,10 +16,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/grit/generated_resources.h" #include "crypto/openssl_bio_string.h" #include "crypto/openssl_util.h" #include "crypto/scoped_openssl_types.h" -#include "grit/generated_resources.h" #include "net/base/net_util.h" #include "net/cert/x509_util_openssl.h" #include "ui/base/l10n/l10n_util.h" |