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

Unified Diff: ash/mus/bridge/wm_window_mus.h

Issue 2320273002: Refactors DimWindow and moves to ash/common (Closed)
Patch Set: feedback and member initializer ordering Created 4 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/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/bridge/wm_window_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_window_mus.h
diff --git a/ash/mus/bridge/wm_window_mus.h b/ash/mus/bridge/wm_window_mus.h
index 2f4c8d96feeec3bd3433637386f1e880f318e6d1..92fc8eda6f3cf51dc93722027ee300aa99e57bf5 100644
--- a/ash/mus/bridge/wm_window_mus.h
+++ b/ash/mus/bridge/wm_window_mus.h
@@ -70,6 +70,11 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver {
static std::vector<WmWindow*> FromMusWindows(
const std::vector<ui::Window*>& mus_windows);
+ void set_wm_window_type(ui::wm::WindowType type) {
+ wm_window_type_ = type;
+ is_wm_window_type_set_ = true;
+ }
+
// Sets the widget associated with the window. The widget is used to query
// state, such as min/max size. The widget is not owned by the WmWindowMus.
void set_widget(views::Widget* widget, WidgetCreationType type) {
@@ -102,6 +107,7 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver {
bool IsContainer() const;
// WmWindow:
+ void Destroy() override;
const WmWindow* GetRootWindow() const override;
WmRootWindowController* GetRootWindowController() override;
WmShell* GetShell() const override;
@@ -150,6 +156,7 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver {
void SetLayoutManager(
std::unique_ptr<WmLayoutManager> layout_manager) override;
WmLayoutManager* GetLayoutManager() override;
+ void SetVisibilityChangesAnimated() override;
void SetVisibilityAnimationType(int type) override;
void SetVisibilityAnimationDuration(base::TimeDelta delta) override;
void SetVisibilityAnimationTransition(
@@ -283,6 +290,10 @@ class WmWindowMus : public WmWindow, public ui::WindowObserver {
// If true the minimum size is 0x0, default is minimum size comes from widget.
bool use_empty_minimum_size_for_testing_ = false;
+ ui::wm::WindowType wm_window_type_ = ui::wm::WINDOW_TYPE_UNKNOWN;
+ // Set to true if set_window_type() is called.
+ bool is_wm_window_type_set_ = false;
+
DISALLOW_COPY_AND_ASSIGN(WmWindowMus);
};
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/bridge/wm_window_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698