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

Unified Diff: ash/wm/window_state_aura.cc

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration 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
« no previous file with comments | « ash/wm/window_state_aura.h ('k') | ash/wm/window_state_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_state_aura.cc
diff --git a/ash/wm/window_state_aura.cc b/ash/wm/window_state_aura.cc
deleted file mode 100644
index 3a38c786a938616cb88af09133adcf9b2c82e614..0000000000000000000000000000000000000000
--- a/ash/wm/window_state_aura.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/wm/window_state_aura.h"
-
-#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_util.h"
-#include "ash/wm_window.h"
-#include "ui/aura/window.h"
-
-namespace ash {
-namespace wm {
-namespace {
-
-// This classes is used so that the WindowState constructor can be made
-// protected. GetWindowState() is the only place that should be creating
-// WindowState.
-class WindowStateAura : public wm::WindowState {
- public:
- explicit WindowStateAura(WmWindow* window) : wm::WindowState(window) {}
- ~WindowStateAura() override {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(WindowStateAura);
-};
-
-} // namespace
-
-WindowState* GetActiveWindowState() {
- aura::Window* active = GetActiveWindow();
- return active ? GetWindowState(active) : nullptr;
-}
-
-WindowState* GetWindowState(aura::Window* window) {
- if (!window)
- return nullptr;
- WindowState* settings = window->GetProperty(kWindowStateKey);
- if (!settings) {
- settings = new WindowStateAura(WmWindow::Get(window));
- window->SetProperty(kWindowStateKey, settings);
- }
- return settings;
-}
-
-const WindowState* GetWindowState(const aura::Window* window) {
- return GetWindowState(const_cast<aura::Window*>(window));
-}
-
-} // namespace wm
-} // namespace ash
« no previous file with comments | « ash/wm/window_state_aura.h ('k') | ash/wm/window_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698