Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Unified Diff: url/url_canon_stdstring.h

Issue 14016005: url: Changes to make it build standalone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add blank line Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « url/url_canon_relative.cc ('k') | url/url_canon_stdstring.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/url_canon_stdstring.h
diff --git a/url/url_canon_stdstring.h b/url/url_canon_stdstring.h
index 21272e035bac953e9073d2c07ba45e91f2071197..cb51f1dccb00cbb58c08c583b278e1caddff8892 100644
--- a/url/url_canon_stdstring.h
+++ b/url/url_canon_stdstring.h
@@ -31,11 +31,14 @@
// strings. Because the canonicalizer tries not to be dependent on the STL,
// we have segregated it here.
-#ifndef GOOGLEURL_SRC_URL_CANON_STDSTRING_H__
-#define GOOGLEURL_SRC_URL_CANON_STDSTRING_H__
+#ifndef URL_URL_CANON_STDSTRING_H_
+#define URL_URL_CANON_STDSTRING_H_
#include <string>
-#include "googleurl/src/url_canon.h"
+
+#include "base/compiler_specific.h"
+#include "url/url_canon.h"
+#include "url/url_common.h"
namespace url_canon {
@@ -55,7 +58,7 @@ namespace url_canon {
//
// Therefore, the user should call Complete() before using the string that
// this class wrote into.
-class StdStringCanonOutput : public CanonOutput {
+class GURL_API StdStringCanonOutput : public CanonOutput {
public:
StdStringCanonOutput(std::string* str)
: CanonOutput(),
@@ -75,11 +78,7 @@ class StdStringCanonOutput : public CanonOutput {
buffer_len_ = cur_len_;
}
- virtual void Resize(int sz) {
- str_->resize(sz);
- buffer_ = str_->empty() ? NULL : &(*str_)[0];
- buffer_len_ = sz;
- }
+ virtual void Resize(int sz) OVERRIDE;
protected:
std::string* str_;
@@ -130,5 +129,4 @@ class StdStringReplacements :
} // namespace url_canon
-#endif // GOOGLEURL_SRC_URL_CANON_STDSTRING_H__
-
+#endif // URL_URL_CANON_STDSTRING_H_
« no previous file with comments | « url/url_canon_relative.cc ('k') | url/url_canon_stdstring.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698