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

Side by Side Diff: chrome/renderer/user_script_slave.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 unified diff | Download patch
« no previous file with comments | « chrome/renderer/renderer_glue.cc ('k') | chrome/renderer/user_script_slave.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
6 #define CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_ 6 #define CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 22 matching lines...) Expand all
33 33
34 private: 34 private:
35 // Shared memory containing raw script data. 35 // Shared memory containing raw script data.
36 scoped_ptr<base::SharedMemory> shared_memory_; 36 scoped_ptr<base::SharedMemory> shared_memory_;
37 37
38 // Parsed script data. 38 // Parsed script data.
39 std::vector<UserScript*> scripts_; 39 std::vector<UserScript*> scripts_;
40 STLElementDeleter<std::vector<UserScript*> > script_deleter_; 40 STLElementDeleter<std::vector<UserScript*> > script_deleter_;
41 41
42 // Greasemonkey API source that is injected with the scripts. 42 // Greasemonkey API source that is injected with the scripts.
43 StringPiece api_js_; 43 base::StringPiece api_js_;
44 44
45 // The line number of the first line of the user script among all of the 45 // The line number of the first line of the user script among all of the
46 // injected javascript. This is used to make reported errors correspond with 46 // injected javascript. This is used to make reported errors correspond with
47 // the proper line in the user script. 47 // the proper line in the user script.
48 int user_script_start_line_; 48 int user_script_start_line_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(UserScriptSlave); 50 DISALLOW_COPY_AND_ASSIGN(UserScriptSlave);
51 }; 51 };
52 52
53 #endif // CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_ 53 #endif // CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
OLDNEW
« no previous file with comments | « chrome/renderer/renderer_glue.cc ('k') | chrome/renderer/user_script_slave.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698