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

Unified Diff: mojo/services/html_viewer/html_viewer.cc

Issue 1002033004: Gets packaging of html_viewer for android working (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/html_viewer/android/java/org/chromium/html_viewer/Main.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/html_viewer/html_viewer.cc
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
index b4354e4c924e7223fc412ed7a23c3ef2f492f03c..8c71a9f3ab55ab08188141b4208174ff49dc615b 100644
--- a/mojo/services/html_viewer/html_viewer.cc
+++ b/mojo/services/html_viewer/html_viewer.cc
@@ -170,6 +170,7 @@ class HTMLViewer : public mojo::ApplicationDelegate,
void Initialize(mojo::ApplicationImpl* app) override {
blink_platform_.reset(new MojoBlinkPlatformImpl(app));
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
+ // Note: this requires file system access.
gin::IsolateHolder::LoadV8Snapshot();
#endif
blink::initialize(blink_platform_.get());
@@ -199,6 +200,8 @@ class HTMLViewer : public mojo::ApplicationDelegate,
is_headless_ = command_line->HasSwitch(kIsHeadless);
if (!is_headless_) {
+ // TODO(sky): consider putting this into the .so so that we don't need
+ // file system access.
base::FilePath ui_test_pak_path;
CHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
« no previous file with comments | « mojo/services/html_viewer/android/java/org/chromium/html_viewer/Main.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698