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/feature/geolocation/blimp_location_provider.h"#include "b limp/engine/feature/geolocation/blimp_location_provider.h"#include "blimp/engine /feature/geolocation/blimp_location_provider.h" | |
|
Wez
2016/06/22 18:51:02
This looks messed-up?
CJ
2016/06/22 20:47:29
Oh my. Not sure what happened there. Fixed.
| |
| 8 #include "blimp/engine/mojo/blob_channel_service.h" | 9 #include "blimp/engine/mojo/blob_channel_service.h" |
| 9 #include "content/public/common/service_registry.h" | 10 #include "content/public/common/service_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 |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 32 return; | 33 return; |
| 33 | 34 |
| 34 blimp_browser_main_parts_->GetSettingsManager()->UpdateWebkitPreferences( | 35 blimp_browser_main_parts_->GetSettingsManager()->UpdateWebkitPreferences( |
| 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 |
| 43 content::LocationProvider* | |
| 44 BlimpContentBrowserClient::OverrideSystemLocationProvider() { | |
| 45 if (!location_provider_) { | |
| 46 location_provider_ = base::WrapUnique(new BlimpLocationProvider()); | |
| 47 } | |
| 48 return location_provider_.get(); | |
| 49 } | |
| 50 | |
| 51 bool BlimpContentBrowserClient::UseNetworkLocationProviders() { | |
| 52 return false; | |
| 53 } | |
| 54 | |
| 42 void BlimpContentBrowserClient::RegisterRenderProcessMojoServices( | 55 void BlimpContentBrowserClient::RegisterRenderProcessMojoServices( |
| 43 content::ServiceRegistry* registry) { | 56 content::ServiceRegistry* registry) { |
| 44 registry->AddService<mojom::BlobChannel>( | 57 registry->AddService<mojom::BlobChannel>( |
| 45 base::Bind(&BlobChannelService::Create)); | 58 base::Bind(&BlobChannelService::Create)); |
| 46 } | 59 } |
| 47 | 60 |
| 48 } // namespace engine | 61 } // namespace engine |
| 49 } // namespace blimp | 62 } // namespace blimp |
| OLD | NEW |