| Index: components/exo/keyboard.cc
|
| diff --git a/components/exo/keyboard.cc b/components/exo/keyboard.cc
|
| index fd261e1ec9dc0aee123cddf5def1db6844d62f5f..5359c84d5f334659315edeb93e6b9ed5ce668315 100644
|
| --- a/components/exo/keyboard.cc
|
| +++ b/components/exo/keyboard.cc
|
| @@ -75,8 +75,8 @@
|
| }
|
|
|
| bool IsPhysicalKeyboardEnabled() {
|
| - // The internal keyboard is enabled if maximize mode is not enabled.
|
| - if (!WMHelper::GetInstance()->IsMaximizeModeWindowManagerEnabled())
|
| + // The internal keyboard is enabled if tablet mode is not enabled.
|
| + if (!WMHelper::GetInstance()->IsTabletModeWindowManagerEnabled())
|
| return true;
|
|
|
| for (auto& keyboard :
|
| @@ -96,7 +96,7 @@
|
| auto* helper = WMHelper::GetInstance();
|
| helper->AddPostTargetHandler(this);
|
| helper->AddFocusObserver(this);
|
| - helper->AddMaximizeModeObserver(this);
|
| + helper->AddTabletModeObserver(this);
|
| helper->AddInputDeviceEventObserver(this);
|
| OnWindowFocused(helper->GetFocusedWindow(), nullptr);
|
| }
|
| @@ -110,7 +110,7 @@
|
| auto* helper = WMHelper::GetInstance();
|
| helper->RemoveFocusObserver(this);
|
| helper->RemovePostTargetHandler(this);
|
| - helper->RemoveMaximizeModeObserver(this);
|
| + helper->RemoveTabletModeObserver(this);
|
| helper->RemoveInputDeviceEventObserver(this);
|
| }
|
|
|
| @@ -215,15 +215,15 @@
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// WMHelper::MaximizeModeObserver overrides:
|
| -
|
| -void Keyboard::OnMaximizeModeStarted() {
|
| +// WMHelper::TabletModeObserver overrides:
|
| +
|
| +void Keyboard::OnTabletModeStarted() {
|
| OnKeyboardDeviceConfigurationChanged();
|
| }
|
|
|
| -void Keyboard::OnMaximizeModeEnding() {}
|
| -
|
| -void Keyboard::OnMaximizeModeEnded() {
|
| +void Keyboard::OnTabletModeEnding() {}
|
| +
|
| +void Keyboard::OnTabletModeEnded() {
|
| OnKeyboardDeviceConfigurationChanged();
|
| }
|
|
|
|
|