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

Unified Diff: ash/wm/common/window_state.h

Issue 1943603002: Makes ash/wm/common a library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 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/common/window_resizer.h ('k') | ash/wm/common/window_state_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/common/window_state.h
diff --git a/ash/wm/common/window_state.h b/ash/wm/common/window_state.h
index 0d33a7eef65cb21ba13b339de53eba67b5414548..aaba95e37c79e89c6edf04621586fb2570dae148 100644
--- a/ash/wm/common/window_state.h
+++ b/ash/wm/common/window_state.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "ash/ash_export.h"
+#include "ash/wm/common/ash_wm_common_export.h"
#include "ash/wm/common/drag_details.h"
#include "ash/wm/common/wm_types.h"
#include "base/gtest_prod_util.h"
@@ -44,7 +44,7 @@ class WmWindow;
// Prefer using this class instead of passing aura::Window* around in
// ash code as this is often what you need to interact with, and
// accessing the window using |window()| is cheap.
-class ASH_EXPORT WindowState {
+class ASH_WM_COMMON_EXPORT WindowState {
public:
// A subclass of State class represents one of the window's states
// that corresponds to WindowStateType in Ash environment, e.g.
@@ -78,7 +78,7 @@ class ASH_EXPORT WindowState {
};
// Call GetWindowState() to instantiate this class.
- ~WindowState();
+ virtual ~WindowState();
WmWindow* window() { return window_; }
const WmWindow* window() const { return window_; }
@@ -298,17 +298,17 @@ class ASH_EXPORT WindowState {
// Called from the associated WmWindow once the show state changes.
void OnWindowShowStateChanged();
+ protected:
+ explicit WindowState(WmWindow* window);
+
private:
friend class DefaultState;
friend class ash::LockWindowState;
friend class ash::MaximizeModeWindowState;
- friend ASH_EXPORT WindowState* GetWindowState(aura::Window*);
FRIEND_TEST_ALL_PREFIXES(WindowAnimationsTest, CrossFadeToBounds);
FRIEND_TEST_ALL_PREFIXES(WindowAnimationsTest,
CrossFadeToBoundsFromTransform);
- explicit WindowState(WmWindow* window);
-
WindowStateDelegate* delegate() { return delegate_.get(); }
// Returns the window's current always_on_top state.
« no previous file with comments | « ash/wm/common/window_resizer.h ('k') | ash/wm/common/window_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698