mac: Remove some uses of IsViewsBrowserCocoa.

Bug: 887392
Change-Id: I5de7b4d218cd31fe637d52d94f9ba888b88a4c1d
Reviewed-on: https://chromium-review.googlesource.com/1249446
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594869}

chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc

@@ -879,21 +879,6 @@ IN_PROC_BROWSER_TEST_F(WebViewFocusInteractiveTest, Focus_AdvanceFocus) {
     content::SimulateKeyPress(embedder_web_contents, ui::DomKey::TAB,
                               ui::DomCode::TAB, ui::VKEY_TAB, false, false,
                               false, false);
-
-#if defined(OS_MACOSX)
-    bool is_cocoa = true;
-#if BUILDFLAG(MAC_VIEWS_BROWSER)
-    is_cocoa = views_mode_controller::IsViewsBrowserCocoa();
-#endif  //  BUILDFLAG(MAC_VIEWS_BROWSER)
-    // TODO(mcnee): A third Tab key press should not be necessary, but we seem
-    // to need this on Mac when using Cocoa browser UI.
-    if (is_cocoa) {
-      content::SimulateKeyPress(embedder_web_contents, ui::DomKey::TAB,
-                                ui::DomCode::TAB, ui::VKEY_TAB, false, false,
-                                false, false);
-    }
-#endif  //  defined(OS_MACOSX)
-
     ASSERT_TRUE(listener.WaitUntilSatisfied());
   }
 }

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

@@ -494,13 +494,11 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, MAYBE_WindowFeatures) {
   // Check that the new popup has (roughly) the requested size.
   gfx::Size window_size = popup->GetContainerBounds().size();
   EXPECT_TRUE(349 <= window_size.width() && window_size.width() <= 351);
-#if defined(OS_MACOSX)
+#if !defined(OS_MACOSX)
   // Window height computation is off in MacViews: https://crbug.com/846329
-  if (!views_mode_controller::IsViewsBrowserCocoa())
-    return;
-#endif
   EXPECT_GE(window_size.height(), 249);
   EXPECT_LE(window_size.height(), 253);
+#endif
 }
 
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CorrectReferrer) {

chrome/browser/ui/cocoa/touchbar/web_textfield_touch_bar_controller.mm

@@ -23,12 +23,6 @@
 @implementation WebTextfieldTouchBarController
 
 + (WebTextfieldTouchBarController*)controllerForWindow:(NSWindow*)window {
-  if (features::IsViewsBrowserCocoa()) {
-    BrowserWindowController* bwc =
-        [BrowserWindowController browserWindowControllerForWindow:window];
-    return [[bwc browserWindowTouchBarController] webTextfieldTouchBar];
-  }
-
   BrowserView* browser_view =
       BrowserView::GetBrowserViewForNativeWindow(window);
   if (!browser_view)

chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc

@@ -25,8 +25,12 @@
 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/sync/bubble_sync_promo_view.h"
-#include "chrome/browser/ui/views_mode_controller.h"
+#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ -44,14 +48,6 @@
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 
-#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
-#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
-#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
-#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
-#endif
-
 #if BUILDFLAG(ENABLE_DICE_SUPPORT)
 #include "chrome/browser/signin/account_consistency_mode_manager.h"
 #include "chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h"
@@ -73,15 +69,8 @@ views::Label* CreateLabel(const base::string16& text) {
   return label;
 }
 
-#if !defined(OS_MACOSX) || BUILDFLAG(MAC_VIEWS_BROWSER)
 views::View* AnchorViewForBrowser(ExtensionInstalledBubble* controller,
                                   Browser* browser) {
-// The Cocoa browser always needs to use an anchor point.
-#if BUILDFLAG(MAC_VIEWS_BROWSER)
-  if (views_mode_controller::IsViewsBrowserCocoa())
-    return nullptr;
-#endif
-
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   views::View* reference_view = nullptr;
 
@@ -110,14 +99,6 @@ views::View* AnchorViewForBrowser(ExtensionInstalledBubble* controller,
     return browser_view->toolbar_button_provider()->GetAppMenuButton();
   return reference_view;
 }
-#else  // OS_MACOSX && !MAC_VIEWS_BROWSER
-// Always use an anchor point in non-Views Mac builds. This needs a separate
-// implementation because non-Views Mac builds can't even reference BrowserView.
-views::View* AnchorViewForBrowser(ExtensionInstalledBubble* controller,
-                                  Browser* browser) {
-  return nullptr;
-}
-#endif
 
 }  // namespace
 

chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc

@@ -41,24 +41,6 @@
 
 namespace media_router {
 
-namespace {
-
-// Returns true if the browser uses Cocoa UI. The Views dialog tests should not
-// be run if this is true.
-bool IsCocoaBrowser() {
-#if defined(OS_MACOSX)
-#if BUILDFLAG(MAC_VIEWS_BROWSER)
-  return features::IsViewsBrowserCocoa();
-#else  // !BUILDFLAG(MAC_VIEWS_BROWSER)
-  return true;
-#endif
-#else  // !defined(OS_MACOSX)
-  return false;
-#endif
-}
-
-}  // namespace
-
 // Uses the WebUI Cast dialog. The Views Cast dialog is used in
 // MediaRouterViewsUIBrowserTest below.
 class MediaRouterUIBrowserTest : public InProcessBrowserTest {
@@ -416,14 +398,8 @@ IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest, PinAndUnpinToolbarIcon) {
   ui::SimpleMenuModel* context_menu = GetIconContextMenu();
   const int command_index = context_menu->GetIndexOfCommandId(
       IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION);
-  if (IsCocoaBrowser()) {
-    // With Cocoa, OnContextMenuClosed() gets called before command execution.
-    GetMediaRouterAction()->OnContextMenuClosed();
-    context_menu->ActivatedAt(command_index);
-  } else {
-    context_menu->ActivatedAt(command_index);
-    GetMediaRouterAction()->OnContextMenuClosed();
-  }
+  context_menu->ActivatedAt(command_index);
+  GetMediaRouterAction()->OnContextMenuClosed();
   GetDialogController()->HideMediaRouterDialog();
   EXPECT_TRUE(ToolbarIconExists());
 
@@ -446,27 +422,19 @@ class MediaRouterViewsUIBrowserTest : public MediaRouterUIBrowserTest {
 
 IN_PROC_BROWSER_TEST_F(MediaRouterViewsUIBrowserTest,
                        OpenDialogFromContextMenu) {
-  if (IsCocoaBrowser())
-    return;
   TestOpenDialogFromContextMenu();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterViewsUIBrowserTest, OpenDialogFromAppMenu) {
-  if (IsCocoaBrowser())
-    return;
   TestOpenDialogFromAppMenu();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterViewsUIBrowserTest,
                        EphemeralToolbarIconForDialog) {
-  if (IsCocoaBrowser())
-    return;
   TestEphemeralToolbarIconForDialog();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaRouterViewsUIBrowserTest, PinAndUnpinToolbarIcon) {
-  if (IsCocoaBrowser())
-    return;
   GetDialogController()->ShowMediaRouterDialog();
   EXPECT_TRUE(ToolbarIconExists());
   // Pin the icon via its context menu.

chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc

@@ -9,7 +9,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/proximity_auth/proximity_auth_error_bubble.h"
-#include "chrome/browser/ui/views_mode_controller.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
@@ -43,12 +42,6 @@ void ShowProximityAuthErrorBubble(const base::string16& message,
                                   const GURL& link_url,
                                   const gfx::Rect& anchor_rect,
                                   content::WebContents* web_contents) {
-#if defined(OS_MACOSX)
-  if (views_mode_controller::IsViewsBrowserCocoa()) {
-    NOTIMPLEMENTED();
-    return;
-  }
-#endif
   // Only one error bubble should be visible at a time.
   // Note that it suffices to check just the |message| for equality, because the
   // |link_range| and |link_url| are always the same for a given |message|
@@ -64,12 +57,6 @@ void ShowProximityAuthErrorBubble(const base::string16& message,
 }
 
 void HideProximityAuthErrorBubble() {
-#if defined(OS_MACOSX)
-  if (views_mode_controller::IsViewsBrowserCocoa()) {
-    NOTIMPLEMENTED();
-    return;
-  }
-#endif
   if (g_bubble.Get())
     g_bubble.Get()->GetWidget()->Close();
 }

components/omnibox/browser/omnibox_field_trial.cc

@@ -774,18 +774,6 @@ OmniboxFieldTrial::GetPedalSuggestionMode() {
 }
 
 bool OmniboxFieldTrial::IsHideSteadyStateUrlSchemeAndSubdomainsEnabled() {
-#if defined(OS_MACOSX)
-#if BUILDFLAG(MAC_VIEWS_BROWSER)
-  // Disable Steady State Elisions on Mac if browser is in Cocoa mode.
-  if (features::IsViewsBrowserCocoa())
-    return false;
-#else   // !BUILDFLAG(MAC_VIEWS_BROWSER)
-  // If MacViews is not even built on Mac, we must be on Cocoa, so disable
-  // State State Elisions.
-  return false;
-#endif  // BUILDFLAG(MAC_VIEWS_BROWSER)
-#endif  // defined(OS_MACOSX)
-
   return base::FeatureList::IsEnabled(
              omnibox::kUIExperimentHideSteadyStateUrlSchemeAndSubdomains) ||
          base::FeatureList::IsEnabled(features::kExperimentalUi);

ui/base/material_design/material_design_controller.cc

@@ -213,10 +213,8 @@ MaterialDesignController::Mode MaterialDesignController::DefaultMode() {
   return MATERIAL_REFRESH;
 #endif  // defined(OS_CHROMEOS)
 
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   return MATERIAL_REFRESH;
-#elif defined(OS_MACOSX) && BUILDFLAG(MAC_VIEWS_BROWSER)
-  return features::IsViewsBrowserCocoa() ? MATERIAL_NORMAL : MATERIAL_REFRESH;
 #else
   return MATERIAL_NORMAL;
 #endif