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

Side by Side Diff: ash/common/wm/container_finder.cc

Issue 2558963002: Move shelf item tooltip flag from delegate to item. (Closed)
Patch Set: Remove WmWindowMus::SetBoolProperty override. Created 4 years 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/common/wm/container_finder.h" 5 #include "ash/common/wm/container_finder.h"
6 6
7 #include "ash/common/session/session_state_delegate.h" 7 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/common/wm/always_on_top_controller.h" 8 #include "ash/common/wm/always_on_top_controller.h"
9 #include "ash/common/wm/root_window_finder.h" 9 #include "ash/common/wm/root_window_finder.h"
10 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
11 #include "ash/common/wm_root_window_controller.h" 11 #include "ash/common/wm_root_window_controller.h"
12 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
13 #include "ash/common/wm_window.h" 13 #include "ash/common/wm_window.h"
14 #include "ash/common/wm_window_property.h"
14 #include "ash/public/cpp/shell_window_ids.h" 15 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
16 17
17 namespace ash { 18 namespace ash {
18 namespace wm { 19 namespace wm {
19 namespace { 20 namespace {
20 21
21 WmWindow* FindContainerRoot(WmShell* shell, const gfx::Rect& bounds) { 22 WmWindow* FindContainerRoot(WmShell* shell, const gfx::Rect& bounds) {
22 if (bounds == gfx::Rect()) 23 if (bounds == gfx::Rect())
23 return shell->GetRootWindowForNewWindows(); 24 return shell->GetRootWindowForNewWindows();
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 case ui::wm::WINDOW_TYPE_POPUP: 85 case ui::wm::WINDOW_TYPE_POPUP:
85 if (window->IsSystemModal()) 86 if (window->IsSystemModal())
86 return GetSystemModalContainer(target_root, window); 87 return GetSystemModalContainer(target_root, window);
87 if (HasTransientParentWindow(window)) 88 if (HasTransientParentWindow(window))
88 return GetContainerForWindow(window->GetTransientParent()); 89 return GetContainerForWindow(window->GetTransientParent());
89 return GetContainerFromAlwaysOnTopController(target_root, window); 90 return GetContainerFromAlwaysOnTopController(target_root, window);
90 case ui::wm::WINDOW_TYPE_CONTROL: 91 case ui::wm::WINDOW_TYPE_CONTROL:
91 return target_root->GetChildByShellWindowId( 92 return target_root->GetChildByShellWindowId(
92 kShellWindowId_UnparentedControlContainer); 93 kShellWindowId_UnparentedControlContainer);
93 case ui::wm::WINDOW_TYPE_PANEL: 94 case ui::wm::WINDOW_TYPE_PANEL:
94 if (window->GetWindowState()->panel_attached()) 95 if (window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED))
95 return target_root->GetChildByShellWindowId( 96 return target_root->GetChildByShellWindowId(
96 kShellWindowId_PanelContainer); 97 kShellWindowId_PanelContainer);
97 return GetContainerFromAlwaysOnTopController(target_root, window); 98 return GetContainerFromAlwaysOnTopController(target_root, window);
98 case ui::wm::WINDOW_TYPE_MENU: 99 case ui::wm::WINDOW_TYPE_MENU:
99 return target_root->GetChildByShellWindowId(kShellWindowId_MenuContainer); 100 return target_root->GetChildByShellWindowId(kShellWindowId_MenuContainer);
100 case ui::wm::WINDOW_TYPE_TOOLTIP: 101 case ui::wm::WINDOW_TYPE_TOOLTIP:
101 return target_root->GetChildByShellWindowId( 102 return target_root->GetChildByShellWindowId(
102 kShellWindowId_DragImageAndTooltipContainer); 103 kShellWindowId_DragImageAndTooltipContainer);
103 default: 104 default:
104 NOTREACHED() << "Window " << window->GetShellWindowId() 105 NOTREACHED() << "Window " << window->GetShellWindowId()
(...skipping 15 matching lines...) Expand all
120 if (priority_root && priority_root->Contains(container)) 121 if (priority_root && priority_root->Contains(container))
121 containers.insert(containers.begin(), container); 122 containers.insert(containers.begin(), container);
122 else 123 else
123 containers.push_back(container); 124 containers.push_back(container);
124 } 125 }
125 return containers; 126 return containers;
126 } 127 }
127 128
128 } // namespace wm 129 } // namespace wm
129 } // namespace ash 130 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/test/test_shelf_item_delegate.cc ('k') | ash/common/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698