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

Unified Diff: mojo/services/html_viewer/blink_platform_impl.h

Issue 827223002: [mojo] Make HTML viewer load the blink resources from the generated pak file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
Index: mojo/services/html_viewer/blink_platform_impl.h
diff --git a/mojo/services/html_viewer/blink_platform_impl.h b/mojo/services/html_viewer/blink_platform_impl.h
index 10f2c49c6a4cc54ef1afa5aabddc9ff0c65e6712..193f0a2dbf556cb73a87a7d7a3a89d6c0a3271b4 100644
--- a/mojo/services/html_viewer/blink_platform_impl.h
+++ b/mojo/services/html_viewer/blink_platform_impl.h
@@ -14,6 +14,7 @@
#include "mojo/services/html_viewer/webthemeengine_impl.h"
#include "third_party/WebKit/public/platform/Platform.h"
#include "third_party/WebKit/public/platform/WebScrollbarBehavior.h"
+#include "ui/base/resource/data_pack.h"
namespace html_viewer {
@@ -52,6 +53,7 @@ class BlinkPlatformImpl : public blink::Platform {
virtual blink::WebScrollbarBehavior* scrollbarBehavior();
virtual const unsigned char* getTraceCategoryEnabledFlag(
const char* category_name);
+ virtual blink::WebData loadResource(const char* name) override;
darin (slow to review) 2015/01/10 05:12:19 nit: when overriding methods from the blink public
private:
void SuspendSharedTimer();
@@ -75,6 +77,7 @@ class BlinkPlatformImpl : public blink::Platform {
WebThemeEngineImpl theme_engine_;
WebMimeRegistryImpl mime_registry_;
blink::WebScrollbarBehavior scrollbar_behavior_;
+ ui::DataPack data_pack_;
DISALLOW_COPY_AND_ASSIGN(BlinkPlatformImpl);
};

Powered by Google App Engine
This is Rietveld 408576698