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

Unified Diff: ash/wm/window_state.h

Issue 314433003: ash: Make wm::WindowState's c'tor private. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 6 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 | « no previous file | ash/wm/window_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_state.h
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
index 936caaa18a115b2041c839d5d272627142aa726d..602c4bf17575a703e03274daa6958350e1ed59cf 100644
--- a/ash/wm/window_state.h
+++ b/ash/wm/window_state.h
@@ -77,7 +77,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver {
DISALLOW_COPY_AND_ASSIGN(State);
};
- explicit WindowState(aura::Window* window);
+ // Call GetWindowState() to instantiate this class.
virtual ~WindowState();
aura::Window* window() { return window_; }
@@ -304,8 +304,11 @@ class ASH_EXPORT WindowState : public aura::WindowObserver {
private:
friend class DefaultState;
friend class ash::MaximizeModeWindowState;
+ friend ASH_EXPORT WindowState* GetWindowState(aura::Window*);
FRIEND_TEST_ALL_PREFIXES(WindowAnimationsTest, CrossFadeToBounds);
+ explicit WindowState(aura::Window* window);
+
WindowStateDelegate* delegate() { return delegate_.get(); }
// Returns the window's current show state.
« no previous file with comments | « no previous file | ash/wm/window_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698