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

Side by Side Diff: ash/common/system/overview/overview_button_tray.cc

Issue 2480813003: Reduce views::Border creation verbosity by promoting factory functions (Closed)
Patch Set: fix bad merge Created 4 years, 1 month 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/common/system/date/date_view.cc ('k') | ash/common/system/status_area_widget_delegate.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/system/overview/overview_button_tray.h" 5 #include "ash/common/system/overview/overview_button_tray.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shelf/shelf_constants.h" 9 #include "ash/common/shelf/shelf_constants.h"
10 #include "ash/common/shelf/wm_shelf_util.h" 10 #include "ash/common/shelf/wm_shelf_util.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 const int vertical_padding = (kTrayItemSize - image.height()) / 2; 121 const int vertical_padding = (kTrayItemSize - image.height()) / 2;
122 const int horizontal_padding = (kTrayItemSize - image.width()) / 2; 122 const int horizontal_padding = (kTrayItemSize - image.width()) / 2;
123 insets = gfx::Insets(vertical_padding, horizontal_padding); 123 insets = gfx::Insets(vertical_padding, horizontal_padding);
124 } else { 124 } else {
125 insets = IsHorizontalAlignment(shelf_alignment()) 125 insets = IsHorizontalAlignment(shelf_alignment())
126 ? gfx::Insets(kHorizontalShelfVerticalPadding, 126 ? gfx::Insets(kHorizontalShelfVerticalPadding,
127 kHorizontalShelfHorizontalPadding) 127 kHorizontalShelfHorizontalPadding)
128 : gfx::Insets(kVerticalShelfVerticalPadding, 128 : gfx::Insets(kVerticalShelfVerticalPadding,
129 kVerticalShelfHorizontalPadding); 129 kVerticalShelfHorizontalPadding);
130 } 130 }
131 icon_->SetBorder(views::Border::CreateEmptyBorder(insets)); 131 icon_->SetBorder(views::CreateEmptyBorder(insets));
132 } 132 }
133 133
134 void OverviewButtonTray::UpdateIconVisibility() { 134 void OverviewButtonTray::UpdateIconVisibility() {
135 // The visibility of the OverviewButtonTray has diverge from 135 // The visibility of the OverviewButtonTray has diverge from
136 // WindowSelectorController::CanSelect. The visibility of the button should 136 // WindowSelectorController::CanSelect. The visibility of the button should
137 // not change during transient times in which CanSelect is false. Such as when 137 // not change during transient times in which CanSelect is false. Such as when
138 // a modal dialog is present. 138 // a modal dialog is present.
139 WmShell* shell = WmShell::Get(); 139 WmShell* shell = WmShell::Get();
140 SessionStateDelegate* session_state_delegate = 140 SessionStateDelegate* session_state_delegate =
141 shell->GetSessionStateDelegate(); 141 shell->GetSessionStateDelegate();
142 142
143 SetVisible( 143 SetVisible(
144 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && 144 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
145 session_state_delegate->IsActiveUserSessionStarted() && 145 session_state_delegate->IsActiveUserSessionStarted() &&
146 !session_state_delegate->IsScreenLocked() && 146 !session_state_delegate->IsScreenLocked() &&
147 session_state_delegate->GetSessionState() == 147 session_state_delegate->GetSessionState() ==
148 session_manager::SessionState::ACTIVE && 148 session_manager::SessionState::ACTIVE &&
149 shell->system_tray_delegate()->GetUserLoginStatus() != 149 shell->system_tray_delegate()->GetUserLoginStatus() !=
150 LoginStatus::KIOSK_APP); 150 LoginStatus::KIOSK_APP);
151 } 151 }
152 152
153 } // namespace ash 153 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/date/date_view.cc ('k') | ash/common/system/status_area_widget_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698