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

Side by Side Diff: webkit/glue/webkit_glue.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 | « webkit/glue/devtools/debugger_agent_impl.cc ('k') | webkit/glue/webkitclient_impl.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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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 WEBKIT_GLUE_WEBKIT_GLUE_H_ 5 #ifndef WEBKIT_GLUE_WEBKIT_GLUE_H_
6 #define WEBKIT_GLUE_WEBKIT_GLUE_H_ 6 #define WEBKIT_GLUE_WEBKIT_GLUE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include <windows.h> 11 #include <windows.h>
12 #endif 12 #endif
13 13
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 16
17 #include "base/clipboard.h" 17 #include "base/clipboard.h"
18 #include "base/file_path.h" 18 #include "base/file_path.h"
19 #include "base/string16.h" 19 #include "base/string16.h"
20 #include "webkit/api/public/WebCanvas.h" 20 #include "webkit/api/public/WebCanvas.h"
21 21
22 class GURL; 22 class GURL;
23 class SkBitmap; 23 class SkBitmap;
24 class StringPiece;
25 class WebView; 24 class WebView;
26 struct WebPluginInfo; 25 struct WebPluginInfo;
27 26
27 namespace base {
28 class StringPiece;
29 }
30
28 namespace skia { 31 namespace skia {
29 class PlatformCanvas; 32 class PlatformCanvas;
30 } 33 }
31 34
32 namespace WebKit { 35 namespace WebKit {
33 class WebFrame; 36 class WebFrame;
34 class WebString; 37 class WebString;
35 } 38 }
36 39
37 namespace webkit_glue { 40 namespace webkit_glue {
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void NotifyCacheStats(); 135 void NotifyCacheStats();
133 136
134 // Glue to get resources from the embedder. 137 // Glue to get resources from the embedder.
135 138
136 // Gets a localized string given a message id. Returns an empty string if the 139 // Gets a localized string given a message id. Returns an empty string if the
137 // message id is not found. 140 // message id is not found.
138 string16 GetLocalizedString(int message_id); 141 string16 GetLocalizedString(int message_id);
139 142
140 // Returns the raw data for a resource. This resource must have been 143 // Returns the raw data for a resource. This resource must have been
141 // specified as BINDATA in the relevant .rc file. 144 // specified as BINDATA in the relevant .rc file.
142 StringPiece GetDataResource(int resource_id); 145 base::StringPiece GetDataResource(int resource_id);
143 146
144 #if defined(OS_WIN) 147 #if defined(OS_WIN)
145 // Loads and returns a cursor. 148 // Loads and returns a cursor.
146 HCURSOR LoadCursor(int cursor_id); 149 HCURSOR LoadCursor(int cursor_id);
147 #endif 150 #endif
148 151
149 // Glue to access the clipboard. 152 // Glue to access the clipboard.
150 153
151 // Get a clipboard that can be used to construct a ScopedClipboardWriterGlue. 154 // Get a clipboard that can be used to construct a ScopedClipboardWriterGlue.
152 Clipboard* ClipboardGetClipboard(); 155 Clipboard* ClipboardGetClipboard();
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 218
216 // Enable or disable the disk cache. Used for debugging. 219 // Enable or disable the disk cache. Used for debugging.
217 void SetCacheMode(bool enabled); 220 void SetCacheMode(bool enabled);
218 221
219 // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER --------------------------------- 222 // ---- END FUNCTIONS IMPLEMENTED BY EMBEDDER ---------------------------------
220 223
221 224
222 } // namespace webkit_glue 225 } // namespace webkit_glue
223 226
224 #endif // WEBKIT_GLUE_WEBKIT_GLUE_H_ 227 #endif // WEBKIT_GLUE_WEBKIT_GLUE_H_
OLDNEW
« no previous file with comments | « webkit/glue/devtools/debugger_agent_impl.cc ('k') | webkit/glue/webkitclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698