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

Side by Side Diff: ash/wm/aura/wm_window_aura.cc

Issue 1911833002: Converts DockedWindowLayoutManager to use WmRootWindowControllerObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « ash/wm/aura/wm_window_aura.h ('k') | ash/wm/common/wm_root_window_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/aura/wm_window_aura.h" 5 #include "ash/wm/aura/wm_window_aura.h"
6 6
7 #include "ash/screen_util.h" 7 #include "ash/screen_util.h"
8 #include "ash/wm/aura/aura_layout_manager_adapter.h" 8 #include "ash/wm/aura/aura_layout_manager_adapter.h"
9 #include "ash/wm/aura/wm_globals_aura.h" 9 #include "ash/wm/aura/wm_globals_aura.h"
10 #include "ash/wm/aura/wm_root_window_controller_aura.h" 10 #include "ash/wm/aura/wm_root_window_controller_aura.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 } 354 }
355 355
356 ui::WindowShowState WmWindowAura::GetShowState() const { 356 ui::WindowShowState WmWindowAura::GetShowState() const {
357 return window_->GetProperty(aura::client::kShowStateKey); 357 return window_->GetProperty(aura::client::kShowStateKey);
358 } 358 }
359 359
360 void WmWindowAura::SetRestoreShowState(ui::WindowShowState show_state) { 360 void WmWindowAura::SetRestoreShowState(ui::WindowShowState show_state) {
361 window_->SetProperty(aura::client::kRestoreShowStateKey, show_state); 361 window_->SetProperty(aura::client::kRestoreShowStateKey, show_state);
362 } 362 }
363 363
364 void WmWindowAura::SetLockedToRoot(bool value) {
365 window_->SetProperty(kStayInSameRootWindowKey, value);
366 }
367
364 void WmWindowAura::SetCapture() { 368 void WmWindowAura::SetCapture() {
365 window_->SetCapture(); 369 window_->SetCapture();
366 } 370 }
367 371
368 bool WmWindowAura::HasCapture() { 372 bool WmWindowAura::HasCapture() {
369 return window_->HasCapture(); 373 return window_->HasCapture();
370 } 374 }
371 375
372 void WmWindowAura::ReleaseCapture() { 376 void WmWindowAura::ReleaseCapture() {
373 window_->ReleaseCapture(); 377 window_->ReleaseCapture();
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 } 535 }
532 536
533 void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window, 537 void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window,
534 bool visible) { 538 bool visible) {
535 FOR_EACH_OBSERVER(WmWindowObserver, observers_, 539 FOR_EACH_OBSERVER(WmWindowObserver, observers_,
536 OnWindowVisibilityChanging(this, visible)); 540 OnWindowVisibilityChanging(this, visible));
537 } 541 }
538 542
539 } // namespace wm 543 } // namespace wm
540 } // namespace ash 544 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/aura/wm_window_aura.h ('k') | ash/wm/common/wm_root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698