Commit 3183d7ce authored by Bret Sepulveda's avatar Bret Sepulveda Committed by Commit Bot

Fix SadTabViewInteractiveUITest suite for Chrome OS when Refresh is on.

The test assumed BlueButton would always be used for dialog buttons,
but LabelButton is used in Harmony (which Refresh implies).

Bug: 846410
Change-Id: Id7fb8f66cc0abb120fdb81294c4d00c3faf060ae
Reviewed-on: https://chromium-review.googlesource.com/1105457Reviewed-by: default avatarPeter Boström <pbos@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568272}
parent efddbaa1
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/common/result_codes.h" #include "content/public/common/result_codes.h"
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/views/controls/button/blue_button.h" #include "ui/views/controls/button/blue_button.h"
#include "ui/views/controls/button/label_button.h" #include "ui/views/controls/button/label_button.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
...@@ -82,10 +83,10 @@ class SadTabViewInteractiveUITest : public InProcessBrowserTest { ...@@ -82,10 +83,10 @@ class SadTabViewInteractiveUITest : public InProcessBrowserTest {
const char* ActionButtonClassName() { const char* ActionButtonClassName() {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
return views::BlueButton::kViewClassName; if (!ui::MaterialDesignController::IsSecondaryUiMaterial())
#else return views::BlueButton::kViewClassName;
return views::LabelButton::kViewClassName;
#endif #endif
return views::LabelButton::kViewClassName;
} }
bool IsFocusedViewInsideViewClass(const char* view_class) { bool IsFocusedViewInsideViewClass(const char* view_class) {
......
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