summaryrefslogtreecommitdiffstats
path: root/components/mus/ws/focus_controller.cc
diff options
context:
space:
mode:
authorben <ben@chromium.org>2016-02-02 11:51:28 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-02 19:53:48 +0000
commit3aeb0b84598e215c9ff270785b1250854b6bd8a0 (patch)
tree71b8ab8a46904bb17ed8e5479ee67945dd268a7b /components/mus/ws/focus_controller.cc
parentaf2c8dd14b11ade2cde6a389b20eb20cab5eee62 (diff)
downloadchromium_src-3aeb0b84598e215c9ff270785b1250854b6bd8a0.zip
chromium_src-3aeb0b84598e215c9ff270785b1250854b6bd8a0.tar.gz
chromium_src-3aeb0b84598e215c9ff270785b1250854b6bd8a0.tar.bz2
Make Screenlock observe shell screenlock state.
R=sky@chromium.org BUG=none Review URL: https://codereview.chromium.org/1648423002 Cr-Commit-Position: refs/heads/master@{#373008}
Diffstat (limited to 'components/mus/ws/focus_controller.cc')
-rw-r--r--components/mus/ws/focus_controller.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/mus/ws/focus_controller.cc b/components/mus/ws/focus_controller.cc
index df0659e..0d46006 100644
--- a/components/mus/ws/focus_controller.cc
+++ b/components/mus/ws/focus_controller.cc
@@ -243,8 +243,8 @@ void FocusController::SetFocusedWindowImpl(
void FocusController::OnDrawnStateWillChange(ServerWindow* ancestor,
ServerWindow* window,
bool is_drawn) {
- DCHECK(!is_drawn);
- DCHECK(root_->Contains(window));
+ // DCHECK(!is_drawn); TODO(sadrul):
+ // DCHECK(root_->Contains(window)); TODO(sadrul):
drawn_tracker_.reset();
auto will_be_hidden = [ancestor, window](ServerWindow* w) {
@@ -296,7 +296,7 @@ void FocusController::OnDrawnStateWillChange(ServerWindow* ancestor,
void FocusController::OnDrawnStateChanged(ServerWindow* ancestor,
ServerWindow* window,
bool is_drawn) {
- DCHECK(false);
+ // DCHECK(false); TODO(sadrul):
}
} // namespace ws