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/browser/extensions/user_script_master.h | |
| 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/browser/extensions/user_script_master.h')
| -rw-r--r-- | chrome/browser/extensions/user_script_master.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index 56aab84..af66879 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -16,7 +16,9 @@ #include "testing/gtest/include/gtest/gtest_prod.h" class MessageLoop; +namespace base { class StringPiece; +} // Manages a segment of shared memory that contains the user scripts the user // has installed. Lives on the UI thread. @@ -70,7 +72,7 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>, : public base::RefCounted<UserScriptMaster::ScriptReloader> { public: // Parses the includes out of |script| and returns them in |includes|. - static bool ParseMetadataHeader(const StringPiece& script_text, + static bool ParseMetadataHeader(const base::StringPiece& script_text, UserScript* script); static void LoadScriptsFromDirectory(const FilePath& script_dir, |