| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "blimp/client/blimp_startup.h" | 5 #include "blimp/client/blimp_startup.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "third_party/skia/include/core/SkGraphics.h" | 12 #include "third_party/skia/include/core/SkGraphics.h" |
| 13 #include "ui/gl/gl_surface.h" | 13 #include "ui/gl/gl_surface.h" |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 base::LazyInstance<scoped_ptr<base::MessageLoopForUI>> g_main_message_loop = | 16 base::LazyInstance<scoped_ptr<base::MessageLoopForUI>> g_main_message_loop = |
| 17 LAZY_INSTANCE_INITIALIZER; | 17 LAZY_INSTANCE_INITIALIZER; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace blimp { | 20 namespace blimp { |
| 21 namespace client { |
| 21 | 22 |
| 22 void InitializeLogging() { | 23 void InitializeLogging() { |
| 23 logging::LoggingSettings settings; | 24 logging::LoggingSettings settings; |
| 24 #if defined(OS_ANDROID) | 25 #if defined(OS_ANDROID) |
| 25 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 26 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
| 26 #else | 27 #else |
| 27 base::FilePath log_filename; | 28 base::FilePath log_filename; |
| 28 PathService::Get(base::DIR_EXE, &log_filename); | 29 PathService::Get(base::DIR_EXE, &log_filename); |
| 29 log_filename = log_filename.AppendASCII("blimp_client.log"); | 30 log_filename = log_filename.AppendASCII("blimp_client.log"); |
| 30 settings.logging_dest = logging::LOG_TO_ALL; | 31 settings.logging_dest = logging::LOG_TO_ALL; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 43 bool InitializeMainMessageLoop() { | 44 bool InitializeMainMessageLoop() { |
| 44 // TODO(dtrainor): Initialize ICU? | 45 // TODO(dtrainor): Initialize ICU? |
| 45 | 46 |
| 46 if (!gfx::GLSurface::InitializeOneOff()) | 47 if (!gfx::GLSurface::InitializeOneOff()) |
| 47 return false; | 48 return false; |
| 48 SkGraphics::Init(); | 49 SkGraphics::Init(); |
| 49 g_main_message_loop.Get().reset(new base::MessageLoopForUI); | 50 g_main_message_loop.Get().reset(new base::MessageLoopForUI); |
| 50 return true; | 51 return true; |
| 51 } | 52 } |
| 52 | 53 |
| 54 } // namespace client |
| 53 } // namespace blimp | 55 } // namespace blimp |
| OLD | NEW |