Commit 04da39fb authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot

macviews: disable infobar translate tests

The infobar isn't supported at all in MacViews builds.

TBR=andrewhayden@chromium.org

Bug: 834754
Change-Id: I476fe3e1373d26d1c013011f1a33fbfce80a9ad1
Reviewed-on: https://chromium-review.googlesource.com/1032758Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554737}
parent aeb037ac
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "third_party/metrics_proto/translate_event.pb.h" #include "third_party/metrics_proto/translate_event.pb.h"
#include "ui/base/ui_base_features.h"
#include "url/gurl.h" #include "url/gurl.h"
namespace { namespace {
...@@ -231,7 +232,7 @@ void ChromeTranslateClient::ShowTranslateUI( ...@@ -231,7 +232,7 @@ void ChromeTranslateClient::ShowTranslateUI(
if (error_type != translate::TranslateErrors::NONE) if (error_type != translate::TranslateErrors::NONE)
step = translate::TRANSLATE_STEP_TRANSLATE_ERROR; step = translate::TRANSLATE_STEP_TRANSLATE_ERROR;
#if !defined(USE_AURA) #if !defined(USE_AURA) && !BUILDFLAG(MAC_VIEWS_BROWSER)
if (!TranslateService::IsTranslateBubbleEnabled()) { if (!TranslateService::IsTranslateBubbleEnabled()) {
// Infobar UI. // Infobar UI.
translate::TranslateInfoBarDelegate::Create( translate::TranslateInfoBarDelegate::Create(
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "ui/base/ui_base_features.h"
// This entire test suite relies on the translate infobar which has been removed // This entire test suite relies on the translate infobar which has been removed
// from Aura. The file should be ported to use the bubble. // from Aura. The file should be ported to use the bubble.
#if !defined(USE_AURA) #if !defined(USE_AURA) && !BUILDFLAG(MAC_VIEWS_BROWSER)
#include <stddef.h> #include <stddef.h>
...@@ -34,7 +36,6 @@ ...@@ -34,7 +36,6 @@
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/test_url_fetcher_factory.h"
#include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_fetcher_delegate.h"
#include "ui/base/ui_base_features.h"
namespace { namespace {
......
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