diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 22:11:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 22:11:45 +0000 |
| commit | bb8551fba8d291273d98b78895235e11b0fb6df6 (patch) | |
| tree | ab8d0940ebf8405378d1f255de9fd125cdaf431d /url/url_canon_icu.h | |
| parent | 188a91a31b55437aa725e67373f3495df60e9e53 (diff) | |
| download | chromium_src-bb8551fba8d291273d98b78895235e11b0fb6df6.zip chromium_src-bb8551fba8d291273d98b78895235e11b0fb6df6.tar.gz chromium_src-bb8551fba8d291273d98b78895235e11b0fb6df6.tar.bz2 | |
url: Changes to make it build standalone.
- Update the gyp file.
- Rename the gyp file from googleurl.gyp to url.gyp, so it matches the directory
name.
- Update the header include paths.
- Update the header include guards.
- Rename the target name from googleurl to url and googleurl_unittests to
url_unittests.
- Add missing OVERRIDEs where clang complains.
BUG=229660
TEST=url_unittests
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/14016005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url_canon_icu.h')
| -rw-r--r-- | url/url_canon_icu.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/url/url_canon_icu.h b/url/url_canon_icu.h index e529fcb..9f54f1a 100644 --- a/url/url_canon_icu.h +++ b/url/url_canon_icu.h @@ -29,10 +29,11 @@ // ICU integration functions. -#ifndef GOOGLEURL_SRC_URL_CANON_ICU_H__ -#define GOOGLEURL_SRC_URL_CANON_ICU_H__ +#ifndef URL_URL_CANON_ICU_H_ +#define URL_URL_CANON_ICU_H_ -#include "googleurl/src/url_canon.h" +#include "base/compiler_specific.h" +#include "url/url_canon.h" typedef struct UConverter UConverter; @@ -51,7 +52,7 @@ class ICUCharsetConverter : public CharsetConverter { GURL_API virtual void ConvertFromUTF16(const char16* input, int input_len, - CanonOutput* output); + CanonOutput* output) OVERRIDE; private: // The ICU converter, not owned by this class. @@ -60,4 +61,4 @@ class ICUCharsetConverter : public CharsetConverter { } // namespace url_canon -#endif // GOOGLEURL_SRC_URL_CANON_ICU_H__ +#endif // URL_URL_CANON_ICU_H_ |