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

Unified Diff: mash/wm/bridge/wm_window_mus.cc

Issue 2012343002: Converts overview to use common ash types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback 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 | « mash/wm/bridge/wm_window_mus.h ('k') | mash/wm/non_client_frame_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/bridge/wm_window_mus.cc
diff --git a/mash/wm/bridge/wm_window_mus.cc b/mash/wm/bridge/wm_window_mus.cc
index b0a0227c9aace9a88732121dbe8bc788ddaeb848..b830c873884e9fc29cd53815f4134f825b94af00 100644
--- a/mash/wm/bridge/wm_window_mus.cc
+++ b/mash/wm/bridge/wm_window_mus.cc
@@ -158,6 +158,10 @@ ash::wm::WmGlobals* WmWindowMus::GetGlobals() const {
return WmGlobalsMus::Get();
}
+base::string16 WmWindowMus::GetTitle() const {
+ return GetWindowTitle(window_);
+}
+
void WmWindowMus::SetShellWindowId(int id) {
shell_window_id_ = id;
}
@@ -240,6 +244,7 @@ gfx::Size WmWindowMus::GetMaximumSize() const {
}
bool WmWindowMus::GetTargetVisibility() const {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
return window_->visible();
}
@@ -248,6 +253,25 @@ bool WmWindowMus::IsVisible() const {
return window_->visible();
}
+void WmWindowMus::SetOpacity(float opacity) {
+ window_->SetOpacity(opacity);
+}
+
+float WmWindowMus::GetTargetOpacity() const {
+ // TODO: need animation support: http://crbug.com/615087.
+ return window_->opacity();
+}
+
+void WmWindowMus::SetTransform(const gfx::Transform& transform) {
+ // TODO: mus needs to support transforms: http://crbug.com/615089.
+ NOTIMPLEMENTED();
+}
+
+gfx::Transform WmWindowMus::GetTargetTransform() const {
+ // TODO: need animation support: http://crbug.com/615087.
+ return gfx::Transform();
+}
+
bool WmWindowMus::IsSystemModal() const {
NOTIMPLEMENTED();
return false;
@@ -277,6 +301,12 @@ int WmWindowMus::GetIntProperty(ash::wm::WmWindowProperty key) {
return 0;
}
+ if (key == ash::wm::WmWindowProperty::TOP_VIEW_INSET) {
+ // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
+ NOTIMPLEMENTED();
+ return 0;
+ }
+
NOTREACHED();
return 0;
}
@@ -326,14 +356,29 @@ ash::wm::WmLayoutManager* WmWindowMus::GetLayoutManager() {
}
void WmWindowMus::SetVisibilityAnimationType(int type) {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
}
void WmWindowMus::SetVisibilityAnimationDuration(base::TimeDelta delta) {
+ // TODO: need animation support: http://crbug.com/615087.
+ NOTIMPLEMENTED();
+}
+
+void WmWindowMus::SetVisibilityAnimationTransition(
+ ::wm::WindowVisibilityAnimationTransition transition) {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
}
void WmWindowMus::Animate(::wm::WindowAnimationType type) {
+ // TODO: need animation support: http://crbug.com/615087.
+ NOTIMPLEMENTED();
+}
+
+void WmWindowMus::StopAnimatingProperty(
+ ui::LayerAnimationElement::AnimatableProperty property) {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
}
@@ -351,6 +396,7 @@ void WmWindowMus::SetBounds(const gfx::Rect& bounds) {
void WmWindowMus::SetBoundsWithTransitionDelay(const gfx::Rect& bounds,
base::TimeDelta delta) {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
SetBounds(bounds);
}
@@ -361,11 +407,13 @@ void WmWindowMus::SetBoundsDirect(const gfx::Rect& bounds) {
}
void WmWindowMus::SetBoundsDirectAnimated(const gfx::Rect& bounds) {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
SetBoundsDirect(bounds);
}
void WmWindowMus::SetBoundsDirectCrossFade(const gfx::Rect& bounds) {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
SetBoundsDirect(bounds);
}
@@ -387,6 +435,7 @@ const gfx::Rect& WmWindowMus::GetBounds() const {
}
gfx::Rect WmWindowMus::GetTargetBounds() {
+ // TODO: need animation support: http://crbug.com/615087.
NOTIMPLEMENTED();
return window_->bounds();
}
@@ -496,6 +545,15 @@ void WmWindowMus::Show() {
window_->SetVisible(true);
}
+void WmWindowMus::CloseWidget() {
+ DCHECK(widget_);
+ // Allow the client to service the close request for remote widgets.
+ if (widget_creation_type_ == WidgetCreationType::FOR_CLIENT)
+ window_->RequestClose();
+ else
+ widget_->Close();
+}
+
bool WmWindowMus::IsFocused() const {
return window_->HasFocus();
}
« no previous file with comments | « mash/wm/bridge/wm_window_mus.h ('k') | mash/wm/non_client_frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698