OLD | NEW |
---|---|
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_browser_main_parts.h" | 5 #include "blimp/engine/app/blimp_browser_main_parts.h" |
6 #include "blimp/engine/app/blimp_content_browser_client.h" | 6 #include "blimp/engine/app/blimp_content_browser_client.h" |
7 #include "blimp/engine/app/settings_manager.h" | 7 #include "blimp/engine/app/settings_manager.h" |
8 #include "blimp/engine/mojo/blob_channel_service.h" | 8 #include "blimp/engine/mojo/blob_channel_service.h" |
9 #include "content/public/browser/browser_thread.h" | |
9 #include "services/shell/public/cpp/interface_registry.h" | 10 #include "services/shell/public/cpp/interface_registry.h" |
10 | 11 |
11 namespace blimp { | 12 namespace blimp { |
12 namespace engine { | 13 namespace engine { |
13 | 14 |
14 BlimpContentBrowserClient::BlimpContentBrowserClient() {} | 15 BlimpContentBrowserClient::BlimpContentBrowserClient() {} |
15 | 16 |
16 BlimpContentBrowserClient::~BlimpContentBrowserClient() {} | 17 BlimpContentBrowserClient::~BlimpContentBrowserClient() {} |
17 | 18 |
18 content::BrowserMainParts* BlimpContentBrowserClient::CreateBrowserMainParts( | 19 content::BrowserMainParts* BlimpContentBrowserClient::CreateBrowserMainParts( |
(...skipping 16 matching lines...) Expand all Loading... | |
35 prefs); | 36 prefs); |
36 } | 37 } |
37 | 38 |
38 BlimpBrowserContext* BlimpContentBrowserClient::GetBrowserContext() { | 39 BlimpBrowserContext* BlimpContentBrowserClient::GetBrowserContext() { |
39 return blimp_browser_main_parts_->GetBrowserContext(); | 40 return blimp_browser_main_parts_->GetBrowserContext(); |
40 } | 41 } |
41 | 42 |
42 void BlimpContentBrowserClient::ExposeInterfacesToRenderer( | 43 void BlimpContentBrowserClient::ExposeInterfacesToRenderer( |
43 shell::InterfaceRegistry* registry, | 44 shell::InterfaceRegistry* registry, |
44 content::RenderProcessHost* render_process_host) { | 45 content::RenderProcessHost* render_process_host) { |
46 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner = | |
47 content::BrowserThread::GetTaskRunnerForThread( | |
48 content::BrowserThread::UI); | |
45 registry->AddInterface<mojom::BlobChannel>( | 49 registry->AddInterface<mojom::BlobChannel>( |
46 base::Bind(&BlobChannelService::Create, | 50 base::Bind(&BlobChannelService::Create, |
47 blimp_browser_main_parts_->GetBlobChannelSender())); | 51 blimp_browser_main_parts_->GetBlobChannelSender()), |
52 ui_task_runner); | |
Ken Rockot(use gerrit already)
2016/07/29 17:09:45
nit: I'd rather just use base::ThreadTaskRunnerHan
| |
48 } | 53 } |
49 | 54 |
50 } // namespace engine | 55 } // namespace engine |
51 } // namespace blimp | 56 } // namespace blimp |
OLD | NEW |