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

Unified Diff: ash/common/wm/panels/panel_layout_manager.cc

Issue 2676673005: ash: Clean up shelf GetAlignment() and IsHorizontalAlignment() calls (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/panels/panel_layout_manager.cc
diff --git a/ash/common/wm/panels/panel_layout_manager.cc b/ash/common/wm/panels/panel_layout_manager.cc
index 85c73f13af36ad674fc7f86b96c75bd9136a2a3b..326652e4f2ce6b356b7af855a1f7d03bf12ed54c 100644
--- a/ash/common/wm/panels/panel_layout_manager.cc
+++ b/ash/common/wm/panels/panel_layout_manager.cc
@@ -602,7 +602,7 @@ void PanelLayoutManager::Relayout() {
base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
const ShelfAlignment alignment = shelf_->GetAlignment();
- const bool horizontal = IsHorizontalAlignment(shelf_->GetAlignment());
+ const bool horizontal = shelf_->IsHorizontalAlignment();
gfx::Rect shelf_bounds = panel_container_->ConvertRectFromScreen(
shelf_->GetWindow()->GetBoundsInScreen());
int panel_start_bounds = kPanelIdealSpacing;
@@ -765,7 +765,7 @@ void PanelLayoutManager::UpdateStacking(WmWindow* active_panel) {
// the titlebar--even though it doesn't update the shelf icon positions, we
// still want the visual effect.
std::map<int, WmWindow*> window_ordering;
- const bool horizontal = IsHorizontalAlignment(shelf_->GetAlignment());
+ const bool horizontal = shelf_->IsHorizontalAlignment();
for (PanelList::const_iterator it = panel_windows_.begin();
it != panel_windows_.end(); ++it) {
gfx::Rect bounds = it->window->GetBounds();
@@ -804,7 +804,7 @@ void PanelLayoutManager::UpdateCallouts() {
if (!shelf_)
return;
- const bool horizontal = IsHorizontalAlignment(shelf_->GetAlignment());
+ const bool horizontal = shelf_->IsHorizontalAlignment();
for (PanelList::iterator iter = panel_windows_.begin();
iter != panel_windows_.end(); ++iter) {
WmWindow* panel = iter->window;
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698