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

Unified Diff: webkit/glue/webkitplatformsupport_impl.h

Issue 14424007: Use the default theme as the fallback UI in Blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed static initializer Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/glue/webkitplatformsupport_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkitplatformsupport_impl.h
diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h
index 145f631ded92036e6b8e2f8d2f23d78ea1542939..e8c2b28329982fd8d340a1e895de51873fb2b5cf 100644
--- a/webkit/glue/webkitplatformsupport_impl.h
+++ b/webkit/glue/webkitplatformsupport_impl.h
@@ -14,6 +14,7 @@
#include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h"
#include "ui/base/layout.h"
#include "webkit/glue/resource_loader_bridge.h"
+#include "webkit/glue/webfallbackthemeengine_impl.h"
#include "webkit/glue/webkit_glue_export.h"
#if defined(USE_DEFAULT_RENDER_THEME)
@@ -57,6 +58,7 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
// Platform methods (partial implementation):
virtual WebKit::WebThemeEngine* themeEngine();
+ virtual WebKit::WebFallbackThemeEngine* fallbackThemeEngine();
virtual base::PlatformFile databaseOpenFile(
const WebKit::WebString& vfs_file_name, int desired_flags);
@@ -186,7 +188,8 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
double shared_timer_fire_time_;
bool shared_timer_fire_time_was_set_while_suspended_;
int shared_timer_suspended_; // counter
- WebThemeEngineImpl theme_engine_;
+ WebThemeEngineImpl native_theme_engine_;
+ WebFallbackThemeEngineImpl fallback_theme_engine_;
base::ThreadLocalStorage::Slot current_thread_slot_;
scoped_ptr<FlingCurveConfiguration> fling_curve_configuration_;
};
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/glue/webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698