| 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/engine/app/blimp_content_main_delegate.h" | 5 #include "blimp/engine/app/blimp_content_main_delegate.h" |
| 6 | 6 |
| 7 #include "base/files/file.h" | 7 #include "base/files/file.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "blimp/common/compositor/blimp_image_serialization_processor.h" | |
| 12 #include "blimp/engine/app/blimp_content_browser_client.h" | 11 #include "blimp/engine/app/blimp_content_browser_client.h" |
| 13 #include "blimp/engine/app/blimp_content_renderer_client.h" | 12 #include "blimp/engine/app/blimp_content_renderer_client.h" |
| 13 #include "mojo/public/cpp/bindings/interface_request.h" |
| 14 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
| 15 | 15 |
| 16 namespace blimp { | 16 namespace blimp { |
| 17 namespace engine { | 17 namespace engine { |
| 18 namespace { | 18 namespace { |
| 19 void InitLogging() { | 19 void InitLogging() { |
| 20 logging::LoggingSettings settings; | 20 logging::LoggingSettings settings; |
| 21 base::FilePath log_filename; | 21 base::FilePath log_filename; |
| 22 PathService::Get(base::DIR_EXE, &log_filename); | 22 PathService::Get(base::DIR_EXE, &log_filename); |
| 23 log_filename = log_filename.AppendASCII("blimp_engine.log"); | 23 log_filename = log_filename.AppendASCII("blimp_engine.log"); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 content::ContentBrowserClient* | 57 content::ContentBrowserClient* |
| 58 BlimpContentMainDelegate::CreateContentBrowserClient() { | 58 BlimpContentMainDelegate::CreateContentBrowserClient() { |
| 59 DCHECK(!browser_client_); | 59 DCHECK(!browser_client_); |
| 60 browser_client_.reset(new BlimpContentBrowserClient); | 60 browser_client_.reset(new BlimpContentBrowserClient); |
| 61 return browser_client_.get(); | 61 return browser_client_.get(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 content::ContentRendererClient* | 64 content::ContentRendererClient* |
| 65 BlimpContentMainDelegate::CreateContentRendererClient() { | 65 BlimpContentMainDelegate::CreateContentRendererClient() { |
| 66 DCHECK(!renderer_client_); | 66 DCHECK(!renderer_client_); |
| 67 scoped_ptr<BlimpImageSerializationProcessor> image_serialization_processor = | 67 renderer_client_.reset(new BlimpContentRendererClient); |
| 68 make_scoped_ptr(new BlimpImageSerializationProcessor( | |
| 69 BlimpImageSerializationProcessor::Mode::SERIALIZATION)); | |
| 70 renderer_client_.reset( | |
| 71 new BlimpContentRendererClient(std::move(image_serialization_processor))); | |
| 72 return renderer_client_.get(); | 68 return renderer_client_.get(); |
| 73 } | 69 } |
| 74 | 70 |
| 75 } // namespace engine | 71 } // namespace engine |
| 76 } // namespace blimp | 72 } // namespace blimp |
| OLD | NEW |