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

Unified Diff: chrome/browser/extensions/user_script_master.h

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 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
Index: chrome/browser/extensions/user_script_master.h
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 56aab8419247b5804bc4fb7cf170c6ed680ab4d1..af668790f31eb5447b441e939abd2aff23feae5c 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,
« no previous file with comments | « chrome/browser/extensions/external_pref_extension_provider.cc ('k') | chrome/browser/extensions/user_script_master.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698