MacViews: Fix mac_views_browser build linker errors.

chrome/browser/ui/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/split_static_library.gni")
 import("//chrome/common/features.gni")
 import("//media/media_options.gni")
@@ skipping 1525 matching lines @@
         "views/extensions/media_gallery_checkbox_view.cc",
         "views/extensions/media_gallery_checkbox_view.h",
       ]
       if (use_aura) {
         sources += [
           "views/extensions/extension_popup_aura.cc",
           "views/extensions/extension_popup_aura.h",
         ]
       }
     }
-    if (!is_mac) {
+    if (!is_mac || mac_views_browser) {
       sources += [
         # This test header is included because it contains forward declarations
         # needed for "friend" statements for use in tests.
         "translate/translate_bubble_test_utils.h",
         "views/accessibility/invert_bubble_view.cc",
         "views/accessibility/invert_bubble_view.h",
         "views/autofill/autofill_popup_base_view.cc",
         "views/autofill/autofill_popup_base_view.h",
         "views/autofill/autofill_popup_view_views.cc",
         "views/autofill/autofill_popup_view_views.h",
@@ skipping 263 matching lines @@
         "views/translate/translate_icon_view.cc",
         "views/translate/translate_icon_view.h",
         "views/update_recommended_message_box.cc",
         "views/update_recommended_message_box.h",
         "views/validation_message_bubble_view.cc",
         "views/validation_message_bubble_view.h",
         "views/website_settings/chooser_bubble_ui_view.cc",
         "views/website_settings/chooser_bubble_ui_view.h",
         "views/website_settings/permission_prompt_impl_views.cc",
       ]
-      if (use_aura) {
-        deps += [
-          "//services/ui/public/cpp",
-          "//services/ui/public/interfaces",
-        ]
 
-        # TODO(erg): These files hard depend on mus, and thus can't be in a gyp
-        # build. When gyp goes away, merge this back into the sources list.
-        sources += [
-          "views/tabs/window_finder_mus.cc",
-          "views/tabs/window_finder_mus.h",
-        ]
+      if (!mac_views_browser) {

[karandeepb, 2016/09/07 08:32:12]

If use_aura is true doesn't that imply !mac_views_browser. I am not sure,
asking. 

[Patti Lor, 2016/09/08 04:00:41]

That's a good point, I will move this if statement to encompass the
//ui/views/mus dependency being added instead. Thanks!

+        if (use_aura) {
+          deps += [
+            "//services/ui/public/cpp",
+            "//services/ui/public/interfaces",
+          ]
+
+          # TODO(erg): These files hard depend on mus, and thus can't be in a gyp
+          # build. When gyp goes away, merge this back into the sources list.
+          sources += [
+            "views/tabs/window_finder_mus.cc",
+            "views/tabs/window_finder_mus.h",
+          ]
+        }
+        deps += [ "//ui/views/mus" ]
       }
-      deps += [ "//ui/views/mus" ]
     }
     if (use_ash) {
       sources += [
         "views/frame/browser_frame_ash.cc",
         "views/frame/browser_frame_ash.h",
         "views/frame/browser_header_painter_ash.cc",
         "views/frame/browser_header_painter_ash.h",
         "views/frame/browser_non_client_frame_view_ash.cc",
         "views/frame/browser_non_client_frame_view_ash.h",
         "views/frame/immersive_context_mus.cc",
@@ skipping 1507 matching lines @@
       "passwords/passwords_model_delegate_mock.cc",
       "passwords/passwords_model_delegate_mock.h",
     ]
     deps += [ "//chrome/test:test_support_ui" ]
   }
 
   if (enable_extensions) {
     deps += [ "//extensions/browser" ]
   }
 }