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

Side by Side Diff: webkit/tools/test_shell/test_shell_webkit_init.h

Issue 12320002: Remove OVERRIDE so we can delete this function upstream. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « no previous file | no next file » | 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) 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/WebKit/chromium/public/WebIDBFactory.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 virtual WebKit::WebString queryLocalizedString( 66 virtual WebKit::WebString queryLocalizedString(
67 WebKit::WebLocalizedString::Name name, 67 WebKit::WebLocalizedString::Name name,
68 const WebKit::WebString& value1, 68 const WebKit::WebString& value1,
69 const WebKit::WebString& value2) OVERRIDE; 69 const WebKit::WebString& value2) OVERRIDE;
70 70
71 virtual WebKit::WebString defaultLocale() OVERRIDE; 71 virtual WebKit::WebString defaultLocale() OVERRIDE;
72 72
73 virtual WebKit::WebStorageNamespace* createLocalStorageNamespace( 73 virtual WebKit::WebStorageNamespace* createLocalStorageNamespace(
74 const WebKit::WebString& path, unsigned quota) OVERRIDE; 74 const WebKit::WebString& path, unsigned quota) OVERRIDE;
75 75
76 virtual WebKit::WebIDBFactory* idbFactory() OVERRIDE; 76 virtual WebKit::WebIDBFactory* idbFactory();
77 77
78 #if defined(OS_WIN) 78 #if defined(OS_WIN)
79 void SetThemeEngine(WebKit::WebThemeEngine* engine) { 79 void SetThemeEngine(WebKit::WebThemeEngine* engine) {
80 active_theme_engine_ = engine ? 80 active_theme_engine_ = engine ?
81 engine : WebKitPlatformSupportImpl::themeEngine(); 81 engine : WebKitPlatformSupportImpl::themeEngine();
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 }
(...skipping 28 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698