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

Side by Side Diff: webkit/support/test_webkit_platform_support.h

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_ 5 #ifndef WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
6 #define WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_ 6 #define WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h" 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebGamepads.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 virtual WebKit::WebAudioDevice* createAudioDevice(size_t bufferSize, 112 virtual WebKit::WebAudioDevice* createAudioDevice(size_t bufferSize,
113 unsigned numberOfInputChannels, unsigned numberOfChannels, 113 unsigned numberOfInputChannels, unsigned numberOfChannels,
114 double sampleRate, WebKit::WebAudioDevice::RenderCallback*); 114 double sampleRate, WebKit::WebAudioDevice::RenderCallback*);
115 virtual WebKit::WebAudioDevice* createAudioDevice(size_t bufferSize, 115 virtual WebKit::WebAudioDevice* createAudioDevice(size_t bufferSize,
116 unsigned numberOfChannels, double sampleRate, 116 unsigned numberOfChannels, double sampleRate,
117 WebKit::WebAudioDevice::RenderCallback*); 117 WebKit::WebAudioDevice::RenderCallback*);
118 118
119 virtual void sampleGamepads(WebKit::WebGamepads& data); 119 virtual void sampleGamepads(WebKit::WebGamepads& data);
120 void setGamepadData(const WebKit::WebGamepads& data); 120 void setGamepadData(const WebKit::WebGamepads& data);
121 121
122 virtual string16 GetLocalizedString(int message_id) OVERRIDE; 122 virtual base::string16 GetLocalizedString(int message_id) OVERRIDE;
123 virtual base::StringPiece GetDataResource( 123 virtual base::StringPiece GetDataResource(
124 int resource_id, 124 int resource_id,
125 ui::ScaleFactor scale_factor) OVERRIDE; 125 ui::ScaleFactor scale_factor) OVERRIDE;
126 virtual void GetPlugins(bool refresh, 126 virtual void GetPlugins(bool refresh,
127 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; 127 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
128 virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader( 128 virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
129 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) 129 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
130 OVERRIDE; 130 OVERRIDE;
131 virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketBridge( 131 virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketBridge(
132 WebKit::WebSocketStreamHandle* handle, 132 WebKit::WebSocketStreamHandle* handle,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 184
185 scoped_refptr<cc::ContextProvider> main_thread_contexts_; 185 scoped_refptr<cc::ContextProvider> main_thread_contexts_;
186 186
187 #if defined(OS_WIN) || defined(OS_MACOSX) 187 #if defined(OS_WIN) || defined(OS_MACOSX)
188 WebKit::WebThemeEngine* active_theme_engine_; 188 WebKit::WebThemeEngine* active_theme_engine_;
189 #endif 189 #endif
190 DISALLOW_COPY_AND_ASSIGN(TestWebKitPlatformSupport); 190 DISALLOW_COPY_AND_ASSIGN(TestWebKitPlatformSupport);
191 }; 191 };
192 192
193 #endif // WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_ 193 #endif // WEBKIT_SUPPORT_TEST_WEBKIT_PLATFORM_SUPPORT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698