Commit 1b6a3edc authored by Michael Hansen's avatar Michael Hansen Committed by Commit Bot

[Nearby] Fix method ordering in NearbySharingServiceImpl.

This fixes the method ordering in nearby_sharing_service_impl.cc to
match the order they are declared in nearby_sharing_service_impl.h.

Change-Id: I9063aceb60ed831598dd9adbed7893ace0b7f110
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2405558
Commit-Queue: Michael Hansen <hansenmichael@google.com>
Reviewed-by: default avatarRyan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807231}
parent 37e4ba77
...@@ -99,14 +99,10 @@ class NearbySharingServiceImpl ...@@ -99,14 +99,10 @@ class NearbySharingServiceImpl
NearbyNotificationDelegate* GetNotificationDelegate( NearbyNotificationDelegate* GetNotificationDelegate(
const std::string& notification_id) override; const std::string& notification_id) override;
NearbyShareSettings* GetSettings() override; NearbyShareSettings* GetSettings() override;
NearbyShareHttpNotifier* GetHttpNotifier() override;
// nearby_share::mojom::NearbyShareSettingsObserver: NearbyShareLocalDeviceDataManager* GetLocalDeviceDataManager() override;
void OnEnabledChanged(bool enabled) override; NearbyShareContactManager* GetContactManager() override;
void OnDeviceNameChanged(const std::string& device_name) override; NearbyShareCertificateManager* GetCertificateManager() override;
void OnDataUsageChanged(nearby_share::mojom::DataUsage data_usage) override;
void OnVisibilityChanged(nearby_share::mojom::Visibility visibility) override;
void OnAllowedContactsChanged(
const std::vector<std::string>& allowed_contacts) override;
// NearbyProcessManager::Observer: // NearbyProcessManager::Observer:
void OnNearbyProfileChanged(Profile* profile) override; void OnNearbyProfileChanged(Profile* profile) override;
...@@ -120,34 +116,44 @@ class NearbySharingServiceImpl ...@@ -120,34 +116,44 @@ class NearbySharingServiceImpl
// Test methods // Test methods
void FlushMojoForTesting(); void FlushMojoForTesting();
NearbyShareHttpNotifier* GetHttpNotifier() override;
NearbyShareLocalDeviceDataManager* GetLocalDeviceDataManager() override;
NearbyShareContactManager* GetContactManager() override;
NearbyShareCertificateManager* GetCertificateManager() override;
void set_free_disk_space_for_testing(int64_t free_disk_space) { void set_free_disk_space_for_testing(int64_t free_disk_space) {
free_disk_space_for_testing_ = free_disk_space; free_disk_space_for_testing_ = free_disk_space;
} }
private:
// nearby_share::mojom::NearbyShareSettingsObserver:
void OnEnabledChanged(bool enabled) override;
void OnDeviceNameChanged(const std::string& device_name) override;
void OnDataUsageChanged(nearby_share::mojom::DataUsage data_usage) override;
void OnVisibilityChanged(nearby_share::mojom::Visibility visibility) override;
void OnAllowedContactsChanged(
const std::vector<std::string>& allowed_contacts) override;
// NearbyConnectionsManager::DiscoveryListener: // NearbyConnectionsManager::DiscoveryListener:
void OnEndpointDiscovered(const std::string& endpoint_id, void OnEndpointDiscovered(const std::string& endpoint_id,
const std::vector<uint8_t>& endpoint_info) override; const std::vector<uint8_t>& endpoint_info) override;
void OnEndpointLost(const std::string& endpoint_id) override; void OnEndpointLost(const std::string& endpoint_id) override;
private:
// ash::SessionObserver: // ash::SessionObserver:
void OnLockStateChanged(bool locked) override; void OnLockStateChanged(bool locked) override;
// BluetoothAdapter::Observer:
void AdapterPresentChanged(device::BluetoothAdapter* adapter,
bool present) override;
void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
bool powered) override;
base::ObserverList<TransferUpdateCallback>& GetReceiveCallbacksFromState( base::ObserverList<TransferUpdateCallback>& GetReceiveCallbacksFromState(
ReceiveSurfaceState state); ReceiveSurfaceState state);
bool IsVisibleInBackground(Visibility visibility); bool IsVisibleInBackground(Visibility visibility);
const base::Optional<std::vector<uint8_t>> CreateEndpointInfo( const base::Optional<std::vector<uint8_t>> CreateEndpointInfo(
const base::Optional<std::string>& device_name); const base::Optional<std::string>& device_name);
void StartFastInitiationAdvertising();
void StopFastInitiationAdvertising();
void GetBluetoothAdapter(); void GetBluetoothAdapter();
void OnGetBluetoothAdapter(scoped_refptr<device::BluetoothAdapter> adapter); void OnGetBluetoothAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
void StartFastInitiationAdvertising();
void OnStartFastInitiationAdvertising(); void OnStartFastInitiationAdvertising();
void OnStartFastInitiationAdvertisingError(); void OnStartFastInitiationAdvertisingError();
void StopFastInitiationAdvertising();
void OnStopFastInitiationAdvertising(); void OnStopFastInitiationAdvertising();
void OnOutgoingAdvertisementDecoded( void OnOutgoingAdvertisementDecoded(
const std::string& endpoint_id, const std::string& endpoint_id,
...@@ -159,10 +165,6 @@ class NearbySharingServiceImpl ...@@ -159,10 +165,6 @@ class NearbySharingServiceImpl
bool IsBluetoothPresent() const; bool IsBluetoothPresent() const;
bool IsBluetoothPowered() const; bool IsBluetoothPowered() const;
bool HasAvailableConnectionMediums(); bool HasAvailableConnectionMediums();
void AdapterPresentChanged(device::BluetoothAdapter* adapter,
bool present) override;
void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
bool powered) override;
void InvalidateSurfaceState(); void InvalidateSurfaceState();
bool ShouldStopNearbyProcess(); bool ShouldStopNearbyProcess();
void InvalidateSendSurfaceState(); void InvalidateSendSurfaceState();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment