Commit 76934ebf authored by Peter Boström's avatar Peter Boström Committed by Commit Bot

Remove IsSecondaryUiMaterial from ash/

This function is being removed and currently always returns true.

Bug: chromium:867557
Change-Id: I6e683990e42a6ad9abb7fe5d9b8cce2f51867c37
Reviewed-on: https://chromium-review.googlesource.com/1166189Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582189}
parent 34080e1b
...@@ -57,8 +57,7 @@ base::string16 MultiprofilesIntroDialog::GetWindowTitle() const { ...@@ -57,8 +57,7 @@ base::string16 MultiprofilesIntroDialog::GetWindowTitle() const {
} }
bool MultiprofilesIntroDialog::ShouldShowCloseButton() const { bool MultiprofilesIntroDialog::ShouldShowCloseButton() const {
// Material UI has no [X] in the corner of this dialog. return false;
return !ui::MaterialDesignController::IsSecondaryUiMaterial();
} }
gfx::Size MultiprofilesIntroDialog::CalculatePreferredSize() const { gfx::Size MultiprofilesIntroDialog::CalculatePreferredSize() const {
......
...@@ -74,8 +74,7 @@ base::string16 SessionAbortedDialog::GetWindowTitle() const { ...@@ -74,8 +74,7 @@ base::string16 SessionAbortedDialog::GetWindowTitle() const {
} }
bool SessionAbortedDialog::ShouldShowCloseButton() const { bool SessionAbortedDialog::ShouldShowCloseButton() const {
// Material UI has no [X] in the corner of this dialog. return false;
return !ui::MaterialDesignController::IsSecondaryUiMaterial();
} }
gfx::Size SessionAbortedDialog::CalculatePreferredSize() const { gfx::Size SessionAbortedDialog::CalculatePreferredSize() const {
......
...@@ -66,8 +66,7 @@ base::string16 TeleportWarningDialog::GetWindowTitle() const { ...@@ -66,8 +66,7 @@ base::string16 TeleportWarningDialog::GetWindowTitle() const {
} }
bool TeleportWarningDialog::ShouldShowCloseButton() const { bool TeleportWarningDialog::ShouldShowCloseButton() const {
// Material UI has no [X] in the corner of this dialog. return false;
return !ui::MaterialDesignController::IsSecondaryUiMaterial();
} }
gfx::Size TeleportWarningDialog::CalculatePreferredSize() const { gfx::Size TeleportWarningDialog::CalculatePreferredSize() const {
......
...@@ -57,8 +57,7 @@ ShelfTooltipBubble::ShelfTooltipBubble(views::View* anchor, ...@@ -57,8 +57,7 @@ ShelfTooltipBubble::ShelfTooltipBubble(views::View* anchor,
// Adjust the anchor location for asymmetrical borders of shelf item. // Adjust the anchor location for asymmetrical borders of shelf item.
if (anchor->border()) if (anchor->border())
insets += anchor->border()->GetInsets(); insets += anchor->border()->GetInsets();
if (ui::MaterialDesignController::IsSecondaryUiMaterial()) insets += gfx::Insets(-kBubblePaddingHorizontalBottom);
insets += gfx::Insets(-kBubblePaddingHorizontalBottom);
set_anchor_view_insets(insets); set_anchor_view_insets(insets);
views::BubbleDialogDelegateView::CreateBubble(this); views::BubbleDialogDelegateView::CreateBubble(this);
......
...@@ -98,8 +98,7 @@ base::string16 LogoutConfirmationDialog::GetWindowTitle() const { ...@@ -98,8 +98,7 @@ base::string16 LogoutConfirmationDialog::GetWindowTitle() const {
} }
bool LogoutConfirmationDialog::ShouldShowCloseButton() const { bool LogoutConfirmationDialog::ShouldShowCloseButton() const {
// Material UI has no [X] in the corner of this dialog. return false;
return !ui::MaterialDesignController::IsSecondaryUiMaterial();
} }
void LogoutConfirmationDialog::WindowClosing() { void LogoutConfirmationDialog::WindowClosing() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment