| 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..214bab61db6ac64af922102fe3d0e1d42c856bf6 100644
|
| --- a/blimp/client/app/blimp_startup.cc
|
| +++ b/blimp/client/app/blimp_startup.cc
|
| @@ -6,6 +6,8 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/at_exit.h"
|
| +#include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/lazy_instance.h"
|
| @@ -13,7 +15,9 @@
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/path_service.h"
|
| #include "blimp/client/app/blimp_discardable_memory_allocator.h"
|
| +#include "blimp/client/core/blimp_client_switches.h"
|
| #include "blimp/client/core/compositor/decoding_image_generator.h"
|
| +#include "blimp/client/public/blimp_client_context.h"
|
| #include "third_party/skia/include/core/SkGraphics.h"
|
| #include "ui/gl/init/gl_factory.h"
|
|
|
| @@ -30,6 +34,10 @@ SkImageGenerator* CreateImageGenerator(SkData* data) {
|
| return blimp::client::DecodingImageGenerator::create(data);
|
| }
|
|
|
| +void TerminateEverything() {
|
| + blimp::client::BlimpClientContext::Terminate();
|
| +}
|
| +
|
| } // namespace
|
|
|
| namespace blimp {
|
| @@ -77,6 +85,10 @@ bool InitializeMainMessageLoop() {
|
| return false;
|
| SkGraphics::Init();
|
| SkGraphics::SetImageGeneratorFromEncodedFactory(CreateImageGenerator);
|
| + base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| + switches::kUseInternalDisplay);
|
| + BlimpClientContext::Initialize();
|
| + base::AtExitManager::RegisterTask(base::Bind(&TerminateEverything));
|
| g_main_message_loop.Get().reset(new base::MessageLoopForUI);
|
| return true;
|
| }
|
|
|