diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
| commit | 8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee (patch) | |
| tree | 5c07a9d5091a56c6d5a1a2b98ec10d19ae3c20e9 /chrome/renderer | |
| parent | f8dce00e633d5ffde45e008fb8f51d5a76942f6b (diff) | |
| download | chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.zip chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.gz chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.bz2 | |
Move StringPiece into the base namespace. It is colliding
with the StringPiece class in icu4.2, which is a problem
when trying to use the system version of icu.
Review URL: http://codereview.chromium.org/193072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/renderer_glue.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/user_script_slave.cc | 8 | ||||
| -rw-r--r-- | chrome/renderer/user_script_slave.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index cb4f6e7..31739d3 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -3129,7 +3129,7 @@ bool RenderView::MaybeLoadAlternateErrorPage(WebFrame* frame, std::string RenderView::GetAltHTMLForTemplate( const DictionaryValue& error_strings, int template_resource_id) const { - const StringPiece template_html( + const base::StringPiece template_html( ResourceBundle::GetSharedInstance().GetRawDataResource( template_resource_id)); diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 2597264..c992010 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -158,7 +158,7 @@ void AppendToLog(const char* file, int line, const char* msg) { logging::LogMessage(file, line).stream() << msg; } -StringPiece GetDataResource(int resource_id) { +base::StringPiece GetDataResource(int resource_id) { return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); } diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 07e8746..2ebd68f 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -42,8 +42,8 @@ UserScriptSlave::UserScriptSlave() IDR_GREASEMONKEY_API_JS); // Count the number of lines that will be injected before the user script. - StringPiece::size_type pos = 0; - while ((pos = api_js_.find('\n', pos)) != StringPiece::npos) { + base::StringPiece::size_type pos = 0; + while ((pos = api_js_.find('\n', pos)) != base::StringPiece::npos) { user_script_start_line_++; pos++; } @@ -95,14 +95,14 @@ bool UserScriptSlave::UpdateScripts(base::SharedMemoryHandle shared_memory) { int body_length = 0; CHECK(pickle.ReadData(&iter, &body, &body_length)); script->js_scripts()[j].set_external_content( - StringPiece(body, body_length)); + base::StringPiece(body, body_length)); } for (size_t j = 0; j < script->css_scripts().size(); ++j) { const char* body = NULL; int body_length = 0; CHECK(pickle.ReadData(&iter, &body, &body_length)); script->css_scripts()[j].set_external_content( - StringPiece(body, body_length)); + base::StringPiece(body, body_length)); } } diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h index 8f1fc9b..614dd85 100644 --- a/chrome/renderer/user_script_slave.h +++ b/chrome/renderer/user_script_slave.h @@ -40,7 +40,7 @@ class UserScriptSlave { STLElementDeleter<std::vector<UserScript*> > script_deleter_; // Greasemonkey API source that is injected with the scripts. - StringPiece api_js_; + base::StringPiece api_js_; // The line number of the first line of the user script among all of the // injected javascript. This is used to make reported errors correspond with |