Revert of Rename MaximizeMode to TabletMode

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index db1a8d7c7f366fd25bfd42d2338d4d236bc9b800..bff6a25023d78bda06375a796bdd5384a3cd7258 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -121,7 +121,7 @@
 class LogoutConfirmationController;
 class LockScreenController;
 class MagnificationController;
-class TabletModeController;
+class MaximizeModeController;
 class MediaController;
 class MouseCursorEventFilter;
 class MruWindowTracker;
@@ -294,8 +294,8 @@
   // Deactivates the virtual keyboard.
   void DeactivateKeyboard();
 
-  // Test if TabletModeWindowManager is not enabled, and if
-  // TabletModeController is not currently setting a display rotation. Or if
+  // Test if MaximizeModeWindowManager is not enabled, and if
+  // MaximizeModeController is not currently setting a display rotation. Or if
   // the |resolution_notification_controller_| is not showing its confirmation
   // dialog. If true then changes to display settings can be saved.
   bool ShouldSaveDisplaySettings();
@@ -333,8 +333,8 @@
   LockScreenController* lock_screen_controller() {
     return lock_screen_controller_.get();
   }
-  TabletModeController* tablet_mode_controller() {
-    return tablet_mode_controller_.get();
+  MaximizeModeController* maximize_mode_controller() {
+    return maximize_mode_controller_.get();
   }
   MediaController* media_controller() { return media_controller_.get(); }
   MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
@@ -567,16 +567,16 @@
   // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
   void UpdateAfterLoginStatusChange(LoginStatus status);
 
-  // Notifies observers that tablet mode has started, windows might still
+  // Notifies observers that maximize mode has started, windows might still
   // animate.
-  void NotifyTabletModeStarted();
-
-  // Notifies observers that tablet mode is about to end.
-  void NotifyTabletModeEnding();
-
-  // Notifies observers that tablet mode has ended, windows might still be
+  void NotifyMaximizeModeStarted();
+
+  // Notifies observers that maximize mode is about to end.
+  void NotifyMaximizeModeEnding();
+
+  // Notifies observers that maximize mode has ended, windows might still be
   // returning to their original position.
-  void NotifyTabletModeEnded();
+  void NotifyMaximizeModeEnded();
 
   // Notifies observers that overview mode is about to be started (before the
   // windows get re-arranged).
@@ -698,7 +698,7 @@
   std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
   std::unique_ptr<LockScreenController> lock_screen_controller_;
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
-  std::unique_ptr<TabletModeController> tablet_mode_controller_;
+  std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaController> media_controller_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<NewWindowController> new_window_controller_;