summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h')
-rw-r--r--chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h b/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
index ec2f26b4a18..c960ff022e6 100644
--- a/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
+++ b/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.h
@@ -17,7 +17,10 @@
#include "components/omnibox/browser/autocomplete_input.h"
#include "components/omnibox/browser/autocomplete_match.h"
#include "components/omnibox/browser/omnibox_controller_emitter.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
class AutocompleteController;
class Profile;
@@ -32,7 +35,7 @@ class OmniboxPageHandler : public AutocompleteControllerDelegate,
public:
// OmniboxPageHandler is deleted when the supplied pipe is destroyed.
OmniboxPageHandler(Profile* profile,
- mojo::InterfaceRequest<mojom::OmniboxPageHandler> request);
+ mojo::PendingReceiver<mojom::OmniboxPageHandler> receiver);
~OmniboxPageHandler() override;
// AutocompleteControllerDelegate overrides:
@@ -40,12 +43,12 @@ class OmniboxPageHandler : public AutocompleteControllerDelegate,
// OmniboxControllerEmitter::Observer overrides:
void OnOmniboxQuery(AutocompleteController* controller,
- const base::string16& input_text) override;
+ const AutocompleteInput& input) override;
void OnOmniboxResultChanged(bool default_match_changed,
AutocompleteController* controller) override;
// mojom::OmniboxPageHandler overrides:
- void SetClientPage(mojom::OmniboxPagePtr page) override;
+ void SetClientPage(mojo::PendingRemote<mojom::OmniboxPage> page) override;
// current_url may be invalid, in which case, autocomplete input's url won't
// be set.
void StartOmniboxQuery(const std::string& input_string,
@@ -80,12 +83,12 @@ class OmniboxPageHandler : public AutocompleteControllerDelegate,
AutocompleteInput input_;
// Handle back to the page by which we can pass results.
- mojom::OmniboxPagePtr page_;
+ mojo::Remote<mojom::OmniboxPage> page_;
// The Profile* handed to us in our constructor.
Profile* profile_;
- mojo::Binding<mojom::OmniboxPageHandler> binding_;
+ mojo::Receiver<mojom::OmniboxPageHandler> receiver_;
ScopedObserver<OmniboxControllerEmitter, OmniboxControllerEmitter::Observer>
observer_;