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/autocomplete | |
| 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/autocomplete')
6 files changed, 6 insertions, 11 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index 1281813..a735947 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -23,11 +23,10 @@ #include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_canon_ip.h" +#include "grit/generated_resources.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" -#include "generated_resources.h" - using base::TimeDelta; // AutocompleteInput ---------------------------------------------------------- diff --git a/chrome/browser/autocomplete/autocomplete_accessibility.cc b/chrome/browser/autocomplete/autocomplete_accessibility.cc index 76eddca..71a0166 100644 --- a/chrome/browser/autocomplete/autocomplete_accessibility.cc +++ b/chrome/browser/autocomplete/autocomplete_accessibility.cc @@ -7,8 +7,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/accessibility/accessible_wrapper.h" #include "chrome/views/view.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" HRESULT AutocompleteAccessibility::Initialize( const AutocompleteEditView* edit_box) { diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 6dcbc9e..4b92d0f 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -35,10 +35,9 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" #include "googleurl/src/url_util.h" +#include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" -#include "generated_resources.h" - #pragma comment(lib, "oleacc.lib") // Needed for accessibility support. /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/autocomplete/autocomplete_popup.cc b/chrome/browser/autocomplete/autocomplete_popup.cc index dd1935d..ecf29fd 100644 --- a/chrome/browser/autocomplete/autocomplete_popup.cc +++ b/chrome/browser/autocomplete/autocomplete_popup.cc @@ -8,7 +8,6 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/dns_global.h" @@ -20,6 +19,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" +#include "grit/theme_resources.h" #include "third_party/icu38/public/common/unicode/ubidi.h" namespace { diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index defb656..c267956 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -11,11 +11,10 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/l10n_util.h" +#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_util.h" -#include "generated_resources.h" - // static std::wstring KeywordProvider::SplitReplacementStringFromInput( const std::wstring& input) { diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index e931912..8e39bd0 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -16,12 +16,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "googleurl/src/url_util.h" +#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_status.h" -#include "generated_resources.h" - using base::Time; using base::TimeDelta; |