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

Unified Diff: ash/system/overview/overview_button_tray.cc

Issue 2906803002: Rename MaximizeMode to TabletMode (Closed)
Patch Set: updated filter Created 3 years, 7 months 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
Index: ash/system/overview/overview_button_tray.cc
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc
index fe543b53f23ac977d2fadb11e2b94710217e3a84..8f116b174bb722f33d17cfd5fef52d70aa6d7b1b 100644
--- a/ash/system/overview/overview_button_tray.cc
+++ b/ash/system/overview/overview_button_tray.cc
@@ -12,9 +12,9 @@
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_container.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/overview/window_selector_controller.h"
+#include "ash/wm/tablet_mode/tablet_mode_controller.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/views/border.h"
@@ -90,11 +90,11 @@ void OverviewButtonTray::OnSessionStateChanged(
UpdateIconVisibility();
}
-void OverviewButtonTray::OnMaximizeModeStarted() {
+void OverviewButtonTray::OnTabletModeStarted() {
UpdateIconVisibility();
}
-void OverviewButtonTray::OnMaximizeModeEnded() {
+void OverviewButtonTray::OnTabletModeEnded() {
UpdateIconVisibility();
}
@@ -126,7 +126,7 @@ void OverviewButtonTray::UpdateIconVisibility() {
Shell* shell = Shell::Get();
SetVisible(
- shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
+ shell->tablet_mode_controller()->IsTabletModeWindowManagerEnabled() &&
session_controller->IsActiveUserSessionStarted() &&
!session_controller->IsScreenLocked() &&
session_controller->GetSessionState() ==

Powered by Google App Engine
This is Rietveld 408576698