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

Unified Diff: blimp/client/app/blimp_startup.cc

Issue 2431653004: Setup Blimp internal string resources. (Closed)
Patch Set: Removed unused entry in public/DEPS Created 4 years, 2 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
Index: blimp/client/app/blimp_startup.cc
diff --git a/blimp/client/app/blimp_startup.cc b/blimp/client/app/blimp_startup.cc
index 59f021f6e241c9cf4c83402397af9197477a2ffb..da1ec5d3a74144eb717c640604d7f9464e67cc0c 100644
--- a/blimp/client/app/blimp_startup.cc
+++ b/blimp/client/app/blimp_startup.cc
@@ -15,6 +15,7 @@
#include "blimp/client/app/blimp_discardable_memory_allocator.h"
#include "blimp/client/core/compositor/decoding_image_generator.h"
#include "third_party/skia/include/core/SkGraphics.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/gl/init/gl_factory.h"
class SkImageGenerator;
@@ -81,5 +82,14 @@ bool InitializeMainMessageLoop() {
return true;
}
+void InitializeResourceBundle() {
+ // Load the pak file for the shell.
+ base::FilePath pak_file;
+ bool pak_file_valid = base::PathService::Get(base::DIR_MODULE, &pak_file);
+ CHECK(pak_file_valid);
+ pak_file = pak_file.Append(FILE_PATH_LITERAL("blimp_shell.pak"));
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
David Trainor- moved to gerrit 2016/10/26 00:43:18 Is the only way to do this through the test method
xingliu 2016/10/26 21:14:41 Blimp engine and content shell, ash shell use this
+}
+
} // namespace client
} // namespace blimp

Powered by Google App Engine
This is Rietveld 408576698