diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-22 23:03:27 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-22 23:03:27 +0000 |
| commit | 34ac8f3dd803e412fe5b34d19fdd46c588aefccf (patch) | |
| tree | f30f606cf18beee326e500246fa1a3f645faa42c /chrome/browser/ssl | |
| parent | cb910e336663dd63a35f2721c50419b0fdc1500e (diff) | |
| download | chromium_src-34ac8f3dd803e412fe5b34d19fdd46c588aefccf.zip chromium_src-34ac8f3dd803e412fe5b34d19fdd46c588aefccf.tar.gz chromium_src-34ac8f3dd803e412fe5b34d19fdd46c588aefccf.tar.bz2 | |
Update include paths for grit files. Go ahead and resort
the headers too.
Review URL: http://codereview.chromium.org/21472
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_blocking_page.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_error_info.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_manager.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.cc | 6 |
4 files changed, 9 insertions, 14 deletions
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index c2569fe..c98975d 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -19,10 +19,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" - -// Generated by GRIT -#include "browser_resources.h" -#include "generated_resources.h" +#include "grit/browser_resources.h" +#include "grit/generated_resources.h" // Note that we always create a navigation entry with SSL errors. // No error happening loading a sub-resource triggers an interstitial so far. diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index ee12ae1..712985f 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -8,13 +8,12 @@ #include "chrome/browser/cert_store.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" +#include "googleurl/src/gurl.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" #include "net/base/ssl_info.h" -#include "googleurl/src/gurl.h" - -#include "chromium_strings.h" -#include "generated_resources.h" SSLErrorInfo::SSLErrorInfo(const std::wstring& title, const std::wstring& details, diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index 195d25e..bc95a53 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -6,7 +6,6 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/load_from_memory_cache_details.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -24,11 +23,12 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" #include "webkit/glue/resource_type.h" -#include "generated_resources.h" #if defined(OS_WIN) // TODO(port): Port these files. diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 5005ec4..1648a48 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -20,15 +20,13 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/time_format.h" -#include "generated_resources.h" +#include "grit/browser_resources.h" +#include "grit/generated_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/ssl_info.h" #include "webkit/glue/console_message_level.h" #include "webkit/glue/resource_type.h" -// Generated by GRIT -#include "browser_resources.h" - #if defined(OS_WIN) // TODO(port): port these files. #include "chrome/browser/tab_contents/tab_contents.h" |