| Index: components/exo/wm_helper.h
|
| diff --git a/components/exo/wm_helper.h b/components/exo/wm_helper.h
|
| index 84245f6b7abbed25dc173e0d9b02ab6443df4080..49a53b8cf9fb3da538098d88664ea7933168d765 100644
|
| --- a/components/exo/wm_helper.h
|
| +++ b/components/exo/wm_helper.h
|
| @@ -53,14 +53,14 @@
|
| virtual ~CursorObserver() {}
|
| };
|
|
|
| - class MaximizeModeObserver {
|
| + class TabletModeObserver {
|
| public:
|
| - virtual void OnMaximizeModeStarted() = 0;
|
| - virtual void OnMaximizeModeEnding() = 0;
|
| - virtual void OnMaximizeModeEnded() = 0;
|
| + virtual void OnTabletModeStarted() = 0;
|
| + virtual void OnTabletModeEnding() = 0;
|
| + virtual void OnTabletModeEnded() = 0;
|
|
|
| protected:
|
| - virtual ~MaximizeModeObserver() {}
|
| + virtual ~TabletModeObserver() {}
|
| };
|
|
|
| class InputDeviceEventObserver {
|
| @@ -90,8 +90,8 @@
|
| void RemoveFocusObserver(FocusObserver* observer);
|
| void AddCursorObserver(CursorObserver* observer);
|
| void RemoveCursorObserver(CursorObserver* observer);
|
| - void AddMaximizeModeObserver(MaximizeModeObserver* observer);
|
| - void RemoveMaximizeModeObserver(MaximizeModeObserver* observer);
|
| + void AddTabletModeObserver(TabletModeObserver* observer);
|
| + void RemoveTabletModeObserver(TabletModeObserver* observer);
|
| void AddInputDeviceEventObserver(InputDeviceEventObserver* observer);
|
| void RemoveInputDeviceEventObserver(InputDeviceEventObserver* observer);
|
| void AddDisplayConfigurationObserver(DisplayConfigurationObserver* observer);
|
| @@ -109,7 +109,7 @@
|
| virtual void RemovePreTargetHandler(ui::EventHandler* handler) = 0;
|
| virtual void AddPostTargetHandler(ui::EventHandler* handler) = 0;
|
| virtual void RemovePostTargetHandler(ui::EventHandler* handler) = 0;
|
| - virtual bool IsMaximizeModeWindowManagerEnabled() const = 0;
|
| + virtual bool IsTabletModeWindowManagerEnabled() const = 0;
|
|
|
| protected:
|
| WMHelper();
|
| @@ -120,9 +120,9 @@
|
| aura::Window* lost_focus);
|
| void NotifyCursorVisibilityChanged(bool is_visible);
|
| void NotifyCursorSetChanged(ui::CursorSetType cursor_set);
|
| - void NotifyMaximizeModeStarted();
|
| - void NotifyMaximizeModeEnding();
|
| - void NotifyMaximizeModeEnded();
|
| + void NotifyTabletModeStarted();
|
| + void NotifyTabletModeEnding();
|
| + void NotifyTabletModeEnded();
|
| void NotifyKeyboardDeviceConfigurationChanged();
|
| void NotifyDisplayConfigurationChanged();
|
|
|
| @@ -130,7 +130,7 @@
|
| base::ObserverList<ActivationObserver> activation_observers_;
|
| base::ObserverList<FocusObserver> focus_observers_;
|
| base::ObserverList<CursorObserver> cursor_observers_;
|
| - base::ObserverList<MaximizeModeObserver> maximize_mode_observers_;
|
| + base::ObserverList<TabletModeObserver> tablet_mode_observers_;
|
| base::ObserverList<InputDeviceEventObserver> input_device_event_observers_;
|
| base::ObserverList<DisplayConfigurationObserver> display_config_observers_;
|
|
|
|
|