| 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/app/blimp_startup.h" | 5 #include "blimp/client/app/blimp_startup.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 } // namespace | 31 } // namespace |
| 32 | 32 |
| 33 namespace blimp { | 33 namespace blimp { |
| 34 namespace client { | 34 namespace client { |
| 35 | 35 |
| 36 void InitializeLogging() { | 36 void InitializeLogging() { |
| 37 // TODO(haibinlu): Remove this before release. | 37 // TODO(haibinlu): Remove this before release. |
| 38 // Enables a few verbose log by default. | 38 // Enables a few verbose log by default. |
| 39 if (!base::CommandLine::ForCurrentProcess()->HasSwitch("vmodule")) { | 39 if (!base::CommandLine::ForCurrentProcess()->HasSwitch("vmodule")) { |
| 40 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 40 std::string log_filter = |
| 41 "vmodule", "blimp_message_pump=1, blimp_connection=1"); | 41 std::string("blimp_message_pump=1, blimp_connection=1,") + |
| 42 std::string("blimp_compositor=1, blimp_compositor_manager=1,") + |
| 43 std::string("remote_channel_impl=1"); |
| 44 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII("vmodule", |
| 45 log_filter); |
| 42 } | 46 } |
| 43 | 47 |
| 44 logging::LoggingSettings settings; | 48 logging::LoggingSettings settings; |
| 45 #if defined(OS_ANDROID) | 49 #if defined(OS_ANDROID) |
| 46 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 50 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
| 47 #else | 51 #else |
| 48 base::FilePath log_filename; | 52 base::FilePath log_filename; |
| 49 PathService::Get(base::DIR_EXE, &log_filename); | 53 PathService::Get(base::DIR_EXE, &log_filename); |
| 50 log_filename = log_filename.AppendASCII("blimp_client.log"); | 54 log_filename = log_filename.AppendASCII("blimp_client.log"); |
| 51 settings.logging_dest = logging::LOG_TO_ALL; | 55 settings.logging_dest = logging::LOG_TO_ALL; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 70 if (!gfx::GLSurface::InitializeOneOff()) | 74 if (!gfx::GLSurface::InitializeOneOff()) |
| 71 return false; | 75 return false; |
| 72 SkGraphics::Init(); | 76 SkGraphics::Init(); |
| 73 SkGraphics::SetImageGeneratorFromEncodedFactory(CreateImageGenerator); | 77 SkGraphics::SetImageGeneratorFromEncodedFactory(CreateImageGenerator); |
| 74 g_main_message_loop.Get().reset(new base::MessageLoopForUI); | 78 g_main_message_loop.Get().reset(new base::MessageLoopForUI); |
| 75 return true; | 79 return true; |
| 76 } | 80 } |
| 77 | 81 |
| 78 } // namespace client | 82 } // namespace client |
| 79 } // namespace blimp | 83 } // namespace blimp |
| OLD | NEW |