Chromium Code Reviews| 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_content_browser_client.h" | 5 #include "blimp/engine/app/blimp_content_browser_client.h" |
| 6 #include "blimp/engine/app/blimp_browser_main_parts.h" | 6 #include "blimp/engine/app/blimp_browser_main_parts.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/common/service_registry.h" | 9 #include "content/public/common/service_registry.h" |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 return; | 32 return; |
| 33 | 33 |
| 34 blimp_browser_main_parts_->GetSettingsManager()->UpdateWebkitPreferences( | 34 blimp_browser_main_parts_->GetSettingsManager()->UpdateWebkitPreferences( |
| 35 prefs); | 35 prefs); |
| 36 } | 36 } |
| 37 | 37 |
| 38 BlimpBrowserContext* BlimpContentBrowserClient::GetBrowserContext() { | 38 BlimpBrowserContext* BlimpContentBrowserClient::GetBrowserContext() { |
| 39 return blimp_browser_main_parts_->GetBrowserContext(); | 39 return blimp_browser_main_parts_->GetBrowserContext(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 content::LocationProvider* | |
| 43 BlimpContentBrowserClient::OverrideSystemLocationProvider() { | |
| 44 if (location_provider_ == nullptr) { | |
|
Wez
2016/06/01 21:45:19
nit: if (!location_provider_)
(Testing a pointer
CJ
2016/06/01 22:37:09
Thanks, I was wondering what was the actual way we
| |
| 45 location_provider_ = base::WrapUnique(new BlimpLocationProvider()); | |
| 46 } | |
| 47 return location_provider_.get(); | |
| 48 } | |
| 49 | |
| 50 bool BlimpContentBrowserClient::UseDefaultLocationProviders() { | |
| 51 return false; | |
| 52 } | |
| 53 | |
| 42 void BlimpContentBrowserClient::RegisterRenderProcessMojoServices( | 54 void BlimpContentBrowserClient::RegisterRenderProcessMojoServices( |
| 43 content::ServiceRegistry* registry) { | 55 content::ServiceRegistry* registry) { |
| 44 registry->AddService<mojom::BlobChannel>( | 56 registry->AddService<mojom::BlobChannel>( |
| 45 base::Bind(&BlobChannelService::Create)); | 57 base::Bind(&BlobChannelService::Create)); |
| 46 } | 58 } |
| 47 | 59 |
| 48 } // namespace engine | 60 } // namespace engine |
| 49 } // namespace blimp | 61 } // namespace blimp |
| OLD | NEW |