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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.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
Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 6b0e5456297aaab0a7a1ed2d4e654ff17d3e2d2b..8cda23f0902944770bc1c642c0b30ff050f5944b 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
-#include "ash/wm/window_settings.h"
+#include "ash/wm/window_state.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/command_line.h"
@@ -213,7 +213,7 @@ bool GetTrackedByWorkspace(Browser* browser) {
#if !defined(USE_ASH) || defined(OS_WIN) // TODO(win_ash)
return true;
#else
- return ash::wm::GetWindowSettings(browser->window()->GetNativeWindow())->
+ return ash::wm::GetWindowState(browser->window()->GetNativeWindow())->
tracked_by_workspace();
#endif
}
@@ -559,10 +559,10 @@ void DetachToOwnWindowStep2(DetachToBrowserTabDragControllerTest* test) {
#if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash)
bool IsWindowPositionManaged(aura::Window* window) {
- return ash::wm::GetWindowSettings(window)->window_position_managed();
+ return ash::wm::GetWindowState(window)->window_position_managed();
}
bool HasUserChangedWindowPositionOrSize(aura::Window* window) {
- return ash::wm::GetWindowSettings(window)->bounds_changed_by_user();
+ return ash::wm::GetWindowState(window)->bounds_changed_by_user();
}
#else
bool IsWindowPositionManaged(gfx::NativeWindow window) {
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698