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

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

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_window_mus.h ('k') | ash/root_window_controller.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.cc
diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
index 84823022e8ed362bd8713621c610aa4458df3c17..0c1a39f3bb32eaf7a849782f66c3ef12402c65c3 100644
--- a/ash/mus/bridge/wm_window_mus.cc
+++ b/ash/mus/bridge/wm_window_mus.cc
@@ -158,6 +158,11 @@ bool WmWindowMus::IsContainer() const {
return GetShellWindowId() != kShellWindowId_Invalid;
}
+void WmWindowMus::Destroy() {
+ window_->Destroy();
+ // WARNING: this has been deleted.
+}
+
const WmWindow* WmWindowMus::GetRootWindow() const {
return Get(window_->GetRoot());
}
@@ -199,7 +204,11 @@ int WmWindowMus::GetShellWindowId() const {
}
ui::wm::WindowType WmWindowMus::GetType() const {
- return GetWmWindowType(window_);
+ // If the WindowType was expicitly set, then it means |window_| was created
+ // by way of WmShellMus::NewWindow() and the type is locally defined. For
+ // windows created in other ways, say from the client, then we need to get
+ // the type from |window_| directly.
+ return is_wm_window_type_set_ ? wm_window_type_ : GetWmWindowType(window_);
}
bool WmWindowMus::IsBubble() {
@@ -426,6 +435,11 @@ WmLayoutManager* WmWindowMus::GetLayoutManager() {
: nullptr;
}
+void WmWindowMus::SetVisibilityChangesAnimated() {
+ // TODO: need animation support: http://crbug.com/615087.
+ NOTIMPLEMENTED();
+}
+
void WmWindowMus::SetVisibilityAnimationType(int type) {
// TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
« no previous file with comments | « ash/mus/bridge/wm_window_mus.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698