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

Side by Side Diff: webkit/tools/test_shell/test_shell_webkit_init.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, 9 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_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 5 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
6 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 6 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace .h" 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebStorageNamespace .h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 82 }
83 83
84 virtual WebKit::WebThemeEngine *themeEngine() OVERRIDE { 84 virtual WebKit::WebThemeEngine *themeEngine() OVERRIDE {
85 return active_theme_engine_; 85 return active_theme_engine_;
86 } 86 }
87 #endif 87 #endif
88 88
89 virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D( 89 virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
90 const WebKit::WebGraphicsContext3D::Attributes& attributes); 90 const WebKit::WebGraphicsContext3D::Attributes& attributes);
91 91
92 virtual string16 GetLocalizedString(int message_id) OVERRIDE; 92 virtual base::string16 GetLocalizedString(int message_id) OVERRIDE;
93 virtual base::StringPiece GetDataResource( 93 virtual base::StringPiece GetDataResource(
94 int resource_id, 94 int resource_id,
95 ui::ScaleFactor scale_factor) OVERRIDE; 95 ui::ScaleFactor scale_factor) OVERRIDE;
96 virtual void GetPlugins(bool refresh, 96 virtual void GetPlugins(bool refresh,
97 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; 97 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
98 virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader( 98 virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
99 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) 99 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
100 OVERRIDE; 100 OVERRIDE;
101 virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketBridge( 101 virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketBridge(
102 WebKit::WebSocketStreamHandle* handle, 102 WebKit::WebSocketStreamHandle* handle,
(...skipping 12 matching lines...) Expand all
115 SimpleWebCookieJarImpl cookie_jar_; 115 SimpleWebCookieJarImpl cookie_jar_;
116 scoped_refptr<TestShellWebBlobRegistryImpl> blob_registry_; 116 scoped_refptr<TestShellWebBlobRegistryImpl> blob_registry_;
117 SimpleFileSystem file_system_; 117 SimpleFileSystem file_system_;
118 118
119 #if defined(OS_WIN) 119 #if defined(OS_WIN)
120 WebKit::WebThemeEngine* active_theme_engine_; 120 WebKit::WebThemeEngine* active_theme_engine_;
121 #endif 121 #endif
122 }; 122 };
123 123
124 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 124 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698