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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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 | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index 3d3fd5b0727645b2f1d5670720b599c8b0c19c7c..43f43a7992355b89121535820d55a68a31c096d5 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -10,6 +10,7 @@
#include <set>
#include <string>
+#include "ash/public/interfaces/touch_view.mojom.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
@@ -23,7 +24,6 @@
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
-#include "chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h"
#include "chromeos/dbus/power_manager_client.h"
#include "chromeos/network/portal_detector/network_portal_detector.h"
#include "components/proximity_auth/screenlock_bridge.h"
@@ -31,6 +31,7 @@
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_ui.h"
+#include "mojo/public/cpp/bindings/binding.h"
#include "net/base/net_errors.h"
#include "ui/base/ime/chromeos/ime_keyboard.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
@@ -217,7 +218,7 @@ class SigninScreenHandler
public NetworkStateInformer::NetworkStateInformerObserver,
public PowerManagerClient::Observer,
public input_method::ImeKeyboard::Observer,
- public TouchViewControllerDelegate::Observer,
+ public ash::mojom::TouchViewObserver,
public OobeUI::Observer {
public:
SigninScreenHandler(
@@ -327,9 +328,8 @@ class SigninScreenHandler
// PowerManagerClient::Observer implementation:
void SuspendDone(const base::TimeDelta& sleep_duration) override;
- // TouchViewControllerDelegate::Observer implementation:
- void OnMaximizeModeStarted() override;
- void OnMaximizeModeEnded() override;
+ // ash::mojom::TouchView:
+ void OnTouchViewToggled(bool enabled) override;
void UpdateAddButtonStatus();
@@ -492,8 +492,9 @@ class SigninScreenHandler
// TODO(antrim@): remove this dependency.
GaiaScreenHandler* gaia_screen_handler_ = nullptr;
- // Maximized mode controller delegate.
- std::unique_ptr<TouchViewControllerDelegate> max_mode_delegate_;
+ mojo::Binding<ash::mojom::TouchViewObserver> touch_view_binding_;
+ ash::mojom::TouchViewManagerPtr touch_view_manager_ptr_;
+ bool touch_view_enabled_ = false;
// Input Method Engine state used at signin screen.
scoped_refptr<input_method::InputMethodManager::State> ime_state_;
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698