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

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

Issue 2176813002: mash: Migrate ShelfTooltipManager to wm common types. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add limited pre-target handler WmWindow interface; Move tooltip manager to common. Created 4 years, 5 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
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/aura/wm_window_aura.h" 5 #include "ash/aura/wm_window_aura.h"
6 6
7 #include "ash/aura/aura_layout_manager_adapter.h" 7 #include "ash/aura/aura_layout_manager_adapter.h"
8 #include "ash/aura/wm_root_window_controller_aura.h" 8 #include "ash/aura/wm_root_window_controller_aura.h"
9 #include "ash/aura/wm_shell_aura.h" 9 #include "ash/aura/wm_shell_aura.h"
10 #include "ash/common/ash_constants.h" 10 #include "ash/common/ash_constants.h"
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 } 655 }
656 656
657 void WmWindowAura::RemoveObserver(WmWindowObserver* observer) { 657 void WmWindowAura::RemoveObserver(WmWindowObserver* observer) {
658 observers_.RemoveObserver(observer); 658 observers_.RemoveObserver(observer);
659 } 659 }
660 660
661 bool WmWindowAura::HasObserver(const WmWindowObserver* observer) const { 661 bool WmWindowAura::HasObserver(const WmWindowObserver* observer) const {
662 return observers_.HasObserver(observer); 662 return observers_.HasObserver(observer);
663 } 663 }
664 664
665 void WmWindowAura::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
666 window_->AddPreTargetHandler(handler);
sky 2016/07/26 13:25:20 This will give different semantics than the mus si
msw 2016/07/26 17:43:25 Added a vague comment, let me know if you have som
667 }
668
669 void WmWindowAura::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
670 window_->RemovePreTargetHandler(handler);
671 }
672
665 void WmWindowAura::OnWindowHierarchyChanging( 673 void WmWindowAura::OnWindowHierarchyChanging(
666 const HierarchyChangeParams& params) { 674 const HierarchyChangeParams& params) {
667 WmWindowObserver::TreeChangeParams wm_params; 675 WmWindowObserver::TreeChangeParams wm_params;
668 wm_params.target = Get(params.target); 676 wm_params.target = Get(params.target);
669 wm_params.new_parent = Get(params.new_parent); 677 wm_params.new_parent = Get(params.new_parent);
670 wm_params.old_parent = Get(params.old_parent); 678 wm_params.old_parent = Get(params.old_parent);
671 FOR_EACH_OBSERVER(WmWindowObserver, observers_, 679 FOR_EACH_OBSERVER(WmWindowObserver, observers_,
672 OnWindowTreeChanging(this, wm_params)); 680 OnWindowTreeChanging(this, wm_params));
673 } 681 }
674 682
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 bool visible) { 745 bool visible) {
738 FOR_EACH_OBSERVER(WmWindowObserver, observers_, 746 FOR_EACH_OBSERVER(WmWindowObserver, observers_,
739 OnWindowVisibilityChanged(this, visible)); 747 OnWindowVisibilityChanged(this, visible));
740 } 748 }
741 749
742 void WmWindowAura::OnWindowTitleChanged(aura::Window* window) { 750 void WmWindowAura::OnWindowTitleChanged(aura::Window* window) {
743 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowTitleChanged(this)); 751 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowTitleChanged(this));
744 } 752 }
745 753
746 } // namespace ash 754 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698