macviews: compile out bookmark bubble and editor

Bug: 825610
Change-Id: I23daefcdbc318009d083a65f611a2b821c77b2c4
Reviewed-on: https://chromium-review.googlesource.com/992653Reviewed-by: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547730}

chrome/app/nibs/BUILD.gn

@@ -10,8 +10,6 @@ assert(is_mac)
 translated_xibs = [
   "AppMenu.xib",
   "BookmarkAllTabs.xib",
-  "BookmarkBubble.xib",
-  "BookmarkEditor.xib",
   "BookmarkNameFolder.xib",
   "CookieDetailsView.xib",
   "DownloadItem.xib",
@@ -32,6 +30,8 @@ translated_xibs = [
 
 if (!mac_views_browser) {
   translated_xibs += [
+    "BookmarkBubble.xib",
+    "BookmarkEditor.xib",
     "CollectedCookies.xib",
     "ContentBlockedCookies.xib",
     "ContentBlockedDownloads.xib",

chrome/browser/ui/BUILD.gn

@@ -2500,6 +2500,8 @@ split_static_library("ui") {
       sources -= [
         "cocoa/bookmarks/bookmark_all_tabs_controller.h",
         "cocoa/bookmarks/bookmark_all_tabs_controller.mm",
+        "cocoa/bookmarks/bookmark_bubble_controller.h",
+        "cocoa/bookmarks/bookmark_bubble_controller.mm",
         "cocoa/bookmarks/bookmark_editor_base_controller.h",
         "cocoa/bookmarks/bookmark_editor_base_controller.mm",
         "cocoa/bookmarks/bookmark_editor_controller.h",

chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -16,6 +16,7 @@
 #include "base/scoped_observer.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/buildflag.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
@@ -106,6 +107,7 @@
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #import "ui/base/cocoa/touch_bar_forward_declarations.h"
+#include "ui/base/ui_features.h"
 #include "ui/display/screen.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
@@ -1605,6 +1607,9 @@ bool IsTabDetachingInFullscreenEnabled() {
         browser_.get(), url, alreadyMarked,
         [self locationBarBridge]->star_decoration());
   } else {
+#if BUILDFLAG(MAC_VIEWS_BROWSER)
+    NOTREACHED() << "MacViews Browser can't show cocoa dialogs";
+#else
     BookmarkModel* model =
         BookmarkModelFactory::GetForBrowserContext(browser_->profile());
     bookmarks::ManagedBookmarkService* managed =
@@ -1618,6 +1623,7 @@ bool IsTabDetachingInFullscreenEnabled() {
                         node:node
            alreadyBookmarked:alreadyMarked];
     [bookmarkBubbleController_ showWindow:self];
+#endif
   }
   DCHECK(bookmarkBubbleObserver_);
 }

chrome/test/BUILD.gn

@@ -4084,6 +4084,7 @@ test("unit_tests") {
     if (mac_views_browser) {
       sources -= [
         "../browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm",
+        "../browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm",
         "../browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm",
         "../browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm",
         "../browser/ui/cocoa/content_settings/collected_cookies_mac_unittest.mm",