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

Unified Diff: ash/accelerators/accelerator_commands.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase fix Created 7 years, 3 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
« no previous file with comments | « no previous file | ash/accelerators/accelerator_commands_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_commands.cc
diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc
index 24b8a62b13e84fee0045b0a6860b80facde2ff8f..c3271b409b4a1341e58a423785755a3126d68b0a 100644
--- a/ash/accelerators/accelerator_commands.cc
+++ b/ash/accelerators/accelerator_commands.cc
@@ -7,6 +7,7 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/wm/window_cycle_controller.h"
+#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
namespace ash {
@@ -21,14 +22,15 @@ bool ToggleMinimized() {
HandleCycleWindow(WindowCycleController::FORWARD, false);
return true;
}
+ wm::WindowState* window_state = wm::GetWindowState(window);
// Disable the shortcut for minimizing full screen window due to
// crbug.com/131709, which is a crashing issue related to minimizing
// full screen pepper window.
- if (wm::IsWindowFullscreen(window) || !wm::CanMinimizeWindow(window))
+ if (window_state->IsFullscreen() || !window_state->CanMinimize())
return false;
ash::Shell::GetInstance()->delegate()->RecordUserMetricsAction(
ash::UMA_MINIMIZE_PER_KEY);
- wm::MinimizeWindow(window);
+ window_state->Minimize();
return true;
}
« no previous file with comments | « no previous file | ash/accelerators/accelerator_commands_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698