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

Unified Diff: chrome/browser/chromeos/chrome_interface_factory.h

Issue 1760743002: Add simple mash context menu support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; use test items; cleanup. Created 4 years, 9 months 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/chromeos/chrome_interface_factory.h
diff --git a/chrome/browser/chromeos/chrome_interface_factory.h b/chrome/browser/chromeos/chrome_interface_factory.h
index 3a8f8f1882a505450793e9783051ee275b223f40..d4c47265a05abab7458d42c4d4d234eda8627489 100644
--- a/chrome/browser/chromeos/chrome_interface_factory.h
+++ b/chrome/browser/chromeos/chrome_interface_factory.h
@@ -6,10 +6,12 @@
#define CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
#include "content/public/common/mojo_shell_connection.h"
+#include "mash/shelf/public/interfaces/context_menu.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/shell/public/cpp/interface_factory.h"
#include "ui/keyboard/keyboard.mojom.h"
+class ContextMenu;
class KeyboardUIService;
namespace chromeos {
@@ -17,7 +19,8 @@ namespace chromeos {
// InterfaceFactory for creating all services provided by chrome.
class ChromeInterfaceFactory
: public content::MojoShellConnection::Listener,
- public mojo::InterfaceFactory<keyboard::mojom::Keyboard> {
+ public mojo::InterfaceFactory<keyboard::mojom::Keyboard>,
+ public mojo::InterfaceFactory<mash::shelf::mojom::ContextMenu> {
public:
ChromeInterfaceFactory();
~ChromeInterfaceFactory() override;
@@ -31,9 +34,17 @@ class ChromeInterfaceFactory
mojo::Connection* connection,
mojo::InterfaceRequest<keyboard::mojom::Keyboard> request) override;
+ // mojo::InterfaceFactory<mash::shelf::mojom::ContextMenu>:
+ void Create(
+ mojo::Connection* connection,
+ mojo::InterfaceRequest<mash::shelf::mojom::ContextMenu> request) override;
+
scoped_ptr<KeyboardUIService> keyboard_ui_service_;
mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
+ scoped_ptr<ContextMenu> context_menu_;
+ mojo::BindingSet<mash::shelf::mojom::ContextMenu> context_menu_bindings_;
+
DISALLOW_COPY_AND_ASSIGN(ChromeInterfaceFactory);
};

Powered by Google App Engine
This is Rietveld 408576698