diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:18:18 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:20:07 +0000 |
| commit | af39f00e1d36360ab4119b873f2a9cc961d4464b (patch) | |
| tree | cb520de46867506827af3cd9ac71c55cfc323f75 /chrome/browser/ssl | |
| parent | 0a0291c65f3cc23cc1b5a3c211019fce1d8ab007 (diff) | |
| download | chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.zip chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.gz chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.bz2 | |
Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 1)
BUG=401588
Review URL: https://codereview.chromium.org/469993006
Cr-Commit-Position: refs/heads/master@{#291367}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_add_certificate.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_blocking_page.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_error_info.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ssl/ssl_add_certificate.cc b/chrome/browser/ssl/ssl_add_certificate.cc index e12c00c..0a79960 100644 --- a/chrome/browser/ssl/ssl_add_certificate.cc +++ b/chrome/browser/ssl/ssl_add_certificate.cc @@ -10,12 +10,12 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/infobars/simple_alert_infobar_delegate.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_errors.h" #include "net/cert/cert_database.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 5ab6ecc..fdfe9d4 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -24,6 +24,8 @@ #include "chrome/browser/ssl/ssl_error_classification.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/cert_store.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/navigation_controller.h" @@ -36,8 +38,6 @@ #include "content/public/common/ssl_status.h" #include "grit/app_locale_settings.h" #include "grit/browser_resources.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/hash_value.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index e21d8f2..71bc546 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -7,9 +7,9 @@ #include "base/i18n/time_formatting.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/cert_store.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/cert/cert_status_flags.h" |