OLD | NEW |
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/system/tray/tray_popup_utils.h" | 5 #include "ash/common/system/tray/tray_popup_utils.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/ash_constants.h" | 10 #include "ash/common/ash_constants.h" |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0))); | 286 views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0))); |
287 view->SetPaintToLayer(); | 287 view->SetPaintToLayer(); |
288 view->layer()->SetFillsBoundsOpaquely(false); | 288 view->layer()->SetFillsBoundsOpaquely(false); |
289 } | 289 } |
290 | 290 |
291 void TrayPopupUtils::ShowStickyHeaderSeparator(views::View* view, | 291 void TrayPopupUtils::ShowStickyHeaderSeparator(views::View* view, |
292 bool show_separator) { | 292 bool show_separator) { |
293 if (show_separator) { | 293 if (show_separator) { |
294 view->SetBorder(views::CreatePaddedBorder( | 294 view->SetBorder(views::CreatePaddedBorder( |
295 views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0, | 295 views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0, |
296 kHorizontalSeparatorColor), | 296 kMenuSeparatorColor), |
297 gfx::Insets(kMenuSeparatorVerticalPadding, 0, | 297 gfx::Insets(kMenuSeparatorVerticalPadding, 0, |
298 kMenuSeparatorVerticalPadding - kSeparatorWidth, 0))); | 298 kMenuSeparatorVerticalPadding - kSeparatorWidth, 0))); |
299 } else { | 299 } else { |
300 view->SetBorder(views::CreateEmptyBorder( | 300 view->SetBorder(views::CreateEmptyBorder( |
301 gfx::Insets(kMenuSeparatorVerticalPadding, 0))); | 301 gfx::Insets(kMenuSeparatorVerticalPadding, 0))); |
302 } | 302 } |
303 view->SchedulePaint(); | 303 view->SchedulePaint(); |
304 } | 304 } |
305 | 305 |
306 void TrayPopupUtils::ConfigureContainer(TriView::Container container, | 306 void TrayPopupUtils::ConfigureContainer(TriView::Container container, |
(...skipping 10 matching lines...) Expand all Loading... |
317 | 317 |
318 views::LabelButton* TrayPopupUtils::CreateTrayPopupButton( | 318 views::LabelButton* TrayPopupUtils::CreateTrayPopupButton( |
319 views::ButtonListener* listener, | 319 views::ButtonListener* listener, |
320 const base::string16& text) { | 320 const base::string16& text) { |
321 auto* button = views::MdTextButton::Create(listener, text); | 321 auto* button = views::MdTextButton::Create(listener, text); |
322 button->SetProminent(true); | 322 button->SetProminent(true); |
323 return button; | 323 return button; |
324 } | 324 } |
325 | 325 |
326 views::Separator* TrayPopupUtils::CreateVerticalSeparator() { | 326 views::Separator* TrayPopupUtils::CreateVerticalSeparator() { |
327 views::Separator* separator = | 327 views::Separator* separator = new views::Separator(); |
328 new views::Separator(views::Separator::HORIZONTAL); | 328 separator->SetPreferredHeight(24); |
329 separator->SetPreferredSize(kHorizontalSeparatorHeight); | 329 separator->SetColor(kMenuSeparatorColor); |
330 separator->SetColor(kHorizontalSeparatorColor); | |
331 return separator; | 330 return separator; |
332 } | 331 } |
333 | 332 |
334 std::unique_ptr<views::InkDrop> TrayPopupUtils::CreateInkDrop( | 333 std::unique_ptr<views::InkDrop> TrayPopupUtils::CreateInkDrop( |
335 TrayPopupInkDropStyle ink_drop_style, | 334 TrayPopupInkDropStyle ink_drop_style, |
336 views::InkDropHostView* host) { | 335 views::InkDropHostView* host) { |
337 std::unique_ptr<views::InkDropImpl> ink_drop = | 336 std::unique_ptr<views::InkDropImpl> ink_drop = |
338 base::MakeUnique<views::InkDropImpl>(host, host->size()); | 337 base::MakeUnique<views::InkDropImpl>(host, host->size()); |
339 ink_drop->SetAutoHighlightMode( | 338 ink_drop->SetAutoHighlightMode( |
340 views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE); | 339 views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 } | 408 } |
410 | 409 |
411 gfx::Rect TrayPopupUtils::GetInkDropBounds(TrayPopupInkDropStyle ink_drop_style, | 410 gfx::Rect TrayPopupUtils::GetInkDropBounds(TrayPopupInkDropStyle ink_drop_style, |
412 const views::View* host) { | 411 const views::View* host) { |
413 gfx::Rect bounds = host->GetLocalBounds(); | 412 gfx::Rect bounds = host->GetLocalBounds(); |
414 bounds.Inset(GetInkDropInsets(ink_drop_style)); | 413 bounds.Inset(GetInkDropInsets(ink_drop_style)); |
415 return bounds; | 414 return bounds; |
416 } | 415 } |
417 | 416 |
418 views::Separator* TrayPopupUtils::CreateListItemSeparator(bool left_inset) { | 417 views::Separator* TrayPopupUtils::CreateListItemSeparator(bool left_inset) { |
419 views::Separator* separator = | 418 views::Separator* separator = new views::Separator(); |
420 new views::Separator(views::Separator::HORIZONTAL); | 419 separator->SetColor(kMenuSeparatorColor); |
421 separator->SetColor(kHorizontalSeparatorColor); | |
422 separator->SetPreferredSize(kSeparatorWidth); | |
423 separator->SetBorder(views::CreateEmptyBorder( | 420 separator->SetBorder(views::CreateEmptyBorder( |
424 kMenuSeparatorVerticalPadding - kSeparatorWidth, | 421 kMenuSeparatorVerticalPadding - views::Separator::kThickness, |
425 left_inset | 422 left_inset |
426 ? kMenuExtraMarginFromLeftEdge + kMenuButtonSize + | 423 ? kMenuExtraMarginFromLeftEdge + kMenuButtonSize + |
427 kTrayPopupLabelHorizontalPadding | 424 kTrayPopupLabelHorizontalPadding |
428 : 0, | 425 : 0, |
429 kMenuSeparatorVerticalPadding, 0)); | 426 kMenuSeparatorVerticalPadding, 0)); |
430 return separator; | 427 return separator; |
431 } | 428 } |
432 | 429 |
433 views::Separator* TrayPopupUtils::CreateListSubHeaderSeparator() { | 430 views::Separator* TrayPopupUtils::CreateListSubHeaderSeparator() { |
434 views::Separator* separator = | 431 views::Separator* separator = new views::Separator(); |
435 new views::Separator(views::Separator::HORIZONTAL); | 432 separator->SetColor(kMenuSeparatorColor); |
436 separator->SetColor(kHorizontalSeparatorColor); | |
437 separator->SetPreferredSize(kSeparatorWidth); | |
438 separator->SetBorder(views::CreateEmptyBorder( | 433 separator->SetBorder(views::CreateEmptyBorder( |
439 kMenuSeparatorVerticalPadding - kSeparatorWidth, 0, 0, 0)); | 434 kMenuSeparatorVerticalPadding - views::Separator::kThickness, 0, 0, 0)); |
440 return separator; | 435 return separator; |
441 } | 436 } |
442 | 437 |
443 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) { | 438 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) { |
444 // TODO(tdanderson): Consider moving this into WmShell, or introduce a | 439 // TODO(tdanderson): Consider moving this into WmShell, or introduce a |
445 // CanShowSettings() method in each delegate type that has a | 440 // CanShowSettings() method in each delegate type that has a |
446 // ShowSettings() method. | 441 // ShowSettings() method. |
447 return status != LoginStatus::NOT_LOGGED_IN && | 442 return status != LoginStatus::NOT_LOGGED_IN && |
448 status != LoginStatus::LOCKED && | 443 status != LoginStatus::LOCKED && |
449 !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen(); | 444 !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen(); |
450 } | 445 } |
451 | 446 |
452 } // namespace ash | 447 } // namespace ash |
OLD | NEW |