| Index: chrome/browser/search_engines/search_provider_install_state_impl.h
|
| diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.h b/chrome/browser/search_engines/search_provider_install_state_impl.h
|
| similarity index 57%
|
| rename from chrome/browser/search_engines/search_provider_install_state_message_filter.h
|
| rename to chrome/browser/search_engines/search_provider_install_state_impl.h
|
| index 8c7de99087cbbe436348005bafaa5b2a68f7fbc0..8cbe51f7e5aa7ac65f210ed7ccbbd125c5567cd8 100644
|
| --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.h
|
| +++ b/chrome/browser/search_engines/search_provider_install_state_impl.h
|
| @@ -2,46 +2,50 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_MESSAGE_FILTER_H_
|
| -#define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_MESSAGE_FILTER_H_
|
| +#ifndef CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_IMPL_H_
|
| +#define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_IMPL_H_
|
|
|
| +#include "base/callback_forward.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/search_engines/search_provider_install_data.h"
|
| -#include "chrome/common/search_provider.h"
|
| +#include "chrome/common/search_provider.mojom.h"
|
| #include "content/public/browser/browser_message_filter.h"
|
| +#include "mojo/public/cpp/bindings/binding_set.h"
|
|
|
| class GURL;
|
| class Profile;
|
|
|
| +namespace content {
|
| +class RenderProcessHost;
|
| +} // namespace content
|
| +
|
| // Handles messages regarding search provider install state on the I/O thread.
|
| -class SearchProviderInstallStateMessageFilter
|
| - : public content::BrowserMessageFilter {
|
| +class SearchProviderInstallStateImpl
|
| + : public chrome::mojom::SearchProviderInstallState {
|
| public:
|
| // Unlike the other methods, the constructor must be called on the UI thread.
|
| - SearchProviderInstallStateMessageFilter(int render_process_id,
|
| - Profile* profile);
|
| + SearchProviderInstallStateImpl(int render_process_id, Profile* profile);
|
| + ~SearchProviderInstallStateImpl() override;
|
|
|
| - // content::BrowserMessageFilter implementation.
|
| - bool OnMessageReceived(const IPC::Message& message) override;
|
| + void Bind(chrome::mojom::SearchProviderInstallStateRequest request);
|
|
|
| private:
|
| - ~SearchProviderInstallStateMessageFilter() override;
|
| -
|
| // Figures out the install state for the search provider.
|
| - search_provider::InstallState GetSearchProviderInstallState(
|
| + chrome::mojom::InstallState GetSearchProviderInstallState(
|
| const GURL& page_location,
|
| const GURL& requested_host);
|
|
|
| // Starts handling the message requesting the search provider install state.
|
| - void OnGetSearchProviderInstallState(const GURL& page_location,
|
| - const GURL& requested_host,
|
| - IPC::Message* reply_msg);
|
| + // chrome::mojom::SearchProviderInstallState override.
|
| + void GetInstallState(const GURL& page_location,
|
| + const GURL& requested_host,
|
| + const GetInstallStateCallback& callback) override;
|
|
|
| // Sends the reply message about the search provider install state.
|
| void ReplyWithProviderInstallState(const GURL& page_location,
|
| const GURL& requested_host,
|
| - IPC::Message* reply_msg);
|
| + const GetInstallStateCallback& callback);
|
|
|
| // Used to do a load and get information about install states.
|
| SearchProviderInstallData provider_data_;
|
| @@ -50,10 +54,12 @@ class SearchProviderInstallStateMessageFilter
|
| // thread.
|
| const bool is_off_the_record_;
|
|
|
| + mojo::BindingSet<chrome::mojom::SearchProviderInstallState> binding_set_;
|
| +
|
| // Used to schedule invocations of ReplyWithProviderInstallState.
|
| - base::WeakPtrFactory<SearchProviderInstallStateMessageFilter> weak_factory_;
|
| + base::WeakPtrFactory<SearchProviderInstallStateImpl> weak_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(SearchProviderInstallStateMessageFilter);
|
| + DISALLOW_COPY_AND_ASSIGN(SearchProviderInstallStateImpl);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_MESSAGE_FILTER_H_
|
| +#endif // CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_IMPL_H_
|
|
|