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

Unified Diff: ash/common/wm/maximize_mode/maximize_mode_controller.h

Issue 2505403003: TouchView Mojom (Closed)
Patch Set: Minor param rename Created 4 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
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/maximize_mode/maximize_mode_controller.h
diff --git a/ash/common/wm/maximize_mode/maximize_mode_controller.h b/ash/common/wm/maximize_mode/maximize_mode_controller.h
index ae5e77a911ba02e4285ee27e8923ade31d2c705b..37fd472a99ec550cfc2402899692d48c581f3be7 100644
--- a/ash/common/wm/maximize_mode/maximize_mode_controller.h
+++ b/ash/common/wm/maximize_mode/maximize_mode_controller.h
@@ -10,8 +10,12 @@
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
#include "ash/common/wm_display_observer.h"
+#include "ash/public/interfaces/touch_view.mojom.h"
+#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/time/time.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/interface_ptr_set.h"
#include "ui/gfx/geometry/vector3d_f.h"
#if defined(OS_CHROMEOS)
@@ -48,6 +52,7 @@ class ASH_EXPORT MaximizeModeController :
public chromeos::AccelerometerReader::Observer,
public chromeos::PowerManagerClient::Observer,
#endif // OS_CHROMEOS
+ NON_EXPORTED_BASE(public mojom::TouchViewManager),
public ShellObserver,
public WmDisplayObserver {
public:
@@ -75,6 +80,9 @@ class ASH_EXPORT MaximizeModeController :
// If the maximize mode is not enabled no action will be performed.
void AddWindow(WmWindow* window);
+ // Binds the mojom::TouchViewManager interface request to this object.
+ void BindRequest(mojom::TouchViewManagerRequest request);
+
// ShellObserver:
void OnAppTerminating() override;
void OnMaximizeModeStarted() override;
@@ -141,6 +149,9 @@ class ASH_EXPORT MaximizeModeController :
// otherwise returns TOUCH_VIEW_INTERNAL_INACTIVE.
TouchViewIntervalType CurrentTouchViewIntervalType();
+ // mojom::TouchViewManager:
+ void AddObserver(mojom::TouchViewObserverPtr observer) override;
+
// The maximized window manager (if enabled).
std::unique_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
@@ -178,6 +189,12 @@ class ASH_EXPORT MaximizeModeController :
gfx::Vector3dF base_smoothed_;
gfx::Vector3dF lid_smoothed_;
+ // Bindings for the TouchViewManager interface.
+ mojo::BindingSet<mojom::TouchViewManager> bindings_;
+
+ // The set of touchview observers to be notified about mode changes.
+ mojo::InterfacePtrSet<mojom::TouchViewObserver> observers_;
+
DISALLOW_COPY_AND_ASSIGN(MaximizeModeController);
};
« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698