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

Unified Diff: ash/wm/workspace/colored_window_controller.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/wm/workspace/auto_window_management.cc ('k') | ash/wm/workspace/snap_sizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/colored_window_controller.cc
diff --git a/ash/wm/workspace/colored_window_controller.cc b/ash/wm/workspace/colored_window_controller.cc
index 81339b54f7c83a3837c3032431bb0706dd2c94ac..bffff5486fa0115dc002d94c035f33216e93b841 100644
--- a/ash/wm/workspace/colored_window_controller.cc
+++ b/ash/wm/workspace/colored_window_controller.cc
@@ -5,7 +5,7 @@
#include "ash/wm/workspace/colored_window_controller.h"
#include "ash/shell_window_ids.h"
-#include "ash/wm/window_settings.h"
+#include "ash/wm/window_state.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/root_window.h"
#include "ui/gfx/canvas.h"
@@ -65,7 +65,7 @@ ColoredWindowController::ColoredWindowController(aura::Window* parent,
widget->Init(params);
// Do this so the parent doesn't attempt to enforce any bounds constraints on
// us.
- wm::GetWindowSettings(widget->GetNativeView())->SetTrackedByWorkspace(false);
+ wm::GetWindowState(widget->GetNativeView())->SetTrackedByWorkspace(false);
widget->GetNativeView()->SetProperty(aura::client::kAnimationsDisabledKey,
true);
widget->GetNativeView()->SetName(window_name);
« no previous file with comments | « ash/wm/workspace/auto_window_management.cc ('k') | ash/wm/workspace/snap_sizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698