Commit f053032e authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

views: wires up IsActive() for DesktopWindowTreeHostPlatform

BUG=none
TEST=none

Change-Id: Iaa61d9eeb3813e5d8131c0790693b69e73fe9602
Reviewed-on: https://chromium-review.googlesource.com/998496Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548585}
parent 31f5e5a2
...@@ -241,9 +241,7 @@ void DesktopWindowTreeHostPlatform::Deactivate() { ...@@ -241,9 +241,7 @@ void DesktopWindowTreeHostPlatform::Deactivate() {
} }
bool DesktopWindowTreeHostPlatform::IsActive() const { bool DesktopWindowTreeHostPlatform::IsActive() const {
// TODO: needs PlatformWindow support. return is_active_;
NOTIMPLEMENTED_LOG_ONCE();
return false;
} }
void DesktopWindowTreeHostPlatform::Maximize() { void DesktopWindowTreeHostPlatform::Maximize() {
...@@ -416,6 +414,7 @@ void DesktopWindowTreeHostPlatform::OnCloseRequest() { ...@@ -416,6 +414,7 @@ void DesktopWindowTreeHostPlatform::OnCloseRequest() {
} }
void DesktopWindowTreeHostPlatform::OnActivationChanged(bool active) { void DesktopWindowTreeHostPlatform::OnActivationChanged(bool active) {
is_active_ = active;
aura::WindowTreeHostPlatform::OnActivationChanged(active); aura::WindowTreeHostPlatform::OnActivationChanged(active);
desktop_native_widget_aura_->HandleActivationChanged(active); desktop_native_widget_aura_->HandleActivationChanged(active);
} }
......
...@@ -104,6 +104,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform ...@@ -104,6 +104,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
bool got_on_closed_ = false; bool got_on_closed_ = false;
bool is_active_ = false;
base::WeakPtrFactory<DesktopWindowTreeHostPlatform> weak_factory_{this}; base::WeakPtrFactory<DesktopWindowTreeHostPlatform> weak_factory_{this};
DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostPlatform); DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostPlatform);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment