Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h

Issue 1430313003: Change MojoWebUIController to use mojo::StrongBindingSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-geolocation-untangle
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h
index 4f9b66ac0ecf4be4f5f10c9d80c47393f7e61d6f..d2de791ae303f9679612167f1c91f79254231cc1 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h
+++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h
@@ -9,12 +9,14 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
-#include "chrome/browser/ui/webui/mojo_web_ui_handler.h"
#include "chrome/browser/ui/webui/omnibox/omnibox.mojom.h"
#include "components/omnibox/browser/autocomplete_controller_delegate.h"
#include "components/omnibox/browser/autocomplete_input.h"
#include "components/omnibox/browser/autocomplete_match.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+
+namespace content {
+class WebUI;
+}
class AutocompleteController;
class Profile;
@@ -24,12 +26,9 @@ class Profile;
// AutocompleteController to OnResultChanged() and passes those results to
// the OmniboxPage.
class OmniboxUIHandler : public AutocompleteControllerDelegate,
- public OmniboxUIHandlerMojo,
- public MojoWebUIHandler {
+ public OmniboxUIHandlerMojo {
public:
- // OmniboxUIHandler is deleted when the supplied pipe is destroyed.
- OmniboxUIHandler(Profile* profile,
- mojo::InterfaceRequest<OmniboxUIHandlerMojo> request);
+ explicit OmniboxUIHandler(content::WebUI* web_ui);
~OmniboxUIHandler() override;
// AutocompleteControllerDelegate overrides:
@@ -68,11 +67,9 @@ class OmniboxUIHandler : public AutocompleteControllerDelegate,
// Handle back to the page by which we can pass results.
OmniboxPagePtr page_;
- // The Profile* handed to us in our constructor.
+ // The Profile* for the content::WebUI handed to us in our constructor.
Profile* profile_;
- mojo::StrongBinding<OmniboxUIHandlerMojo> binding_;
-
DISALLOW_COPY_AND_ASSIGN(OmniboxUIHandler);
};
« no previous file with comments | « chrome/browser/ui/webui/omnibox/omnibox_ui.cc ('k') | chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698