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

Unified Diff: ash/test/test_shell_delegate.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 | « ash/system/tray/tray_background_view.cc ('k') | ash/touch/touch_hud_projection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 4bd60838d724cdf8b635ce39f6303f63fab4adea..85851eb19b2745476f28ccd05c3a3da54897577e 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -15,6 +15,7 @@
#include "ash/test/test_launcher_delegate.h"
#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_system_tray_delegate.h"
+#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "base/logging.h"
#include "content/public/test/test_browser_context.h"
@@ -67,9 +68,9 @@ void TestShellDelegate::NewWindow(bool incognito) {
}
void TestShellDelegate::ToggleMaximized() {
- aura::Window* window = ash::wm::GetActiveWindow();
- if (window)
- ash::wm::ToggleMaximizedWindow(window);
+ wm::WindowState* window_state = wm::GetActiveWindowState();
+ if (window_state)
+ window_state->ToggleMaximized();
}
void TestShellDelegate::ToggleFullscreen() {
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/touch/touch_hud_projection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698