[Mac] Include MacViews native app windows in regular builds.

chrome/browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm

Index: chrome/browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm b/chrome/browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm
index 5a8643371aa4602429a6d9772303775361bb492f..094739a805aeaefc3db9794b860d7980a6c83ce9 100644
--- a/chrome/browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm
+++ b/chrome/browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm
@@ -4,11 +4,30 @@
 
 #include "chrome/browser/ui/apps/chrome_app_window_client.h"
 
+#include "base/command_line.h"
 #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
+#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_mac.h"

[tapted, 2015/06/04 04:48:00]

e.g. this would be disallowed, because this is not a "views_mac" file.

You could instead do

#include "chrome/browser/ui/cocoa/apps/chrome_app_window_client_views_mac.h"

Then in chrome/browser/ui/cocoa/apps/chrome_app_window_client_views_mac.cc
define a function like

extensions::NativeAppWindow* CreateViewsNativeAppWindow(
    extensions::AppWindow* app_window,
    const extensions::AppWindow::CreateParams& params) {
...
}



An alternative: There's actually no restriction on c/b/ui/views calling into
c/b/ui/cocoa. We could move this file to c/b/ui/views and call it
chrome_app_window_client_mac.mm

(it would sit next to chrome_app_window_client_views.cc which should probably be
renamed to chrome_app_window_client_aura.cc)


Or.. we could just say this is under /apps/ and we know what we're up to.


But see https://codereview.chromium.org/1162393003/ for an example of the stuff
I'm trying to avoid with that DEPS CL linked above. Maybe you have some other
ideas on how to solve that.

[jackhou1, 2015/06/04 06:06:40]

What about renaming this file to chrome_app_window_client_views_mac.mm, and
leave it in c/b/ui/cocoa/apps/?

I considered modifying c/b/ui/views/apps/chrome_app_window_client_views_mac.mm
instead of this. Leaving the other file as-is means that mac_views_browser
always uses mac-views app windows and does not need to pull in any of the cocoa
stuff, but maybe that's not a big deal.

[tapted, 2015/06/05 02:09:07]

Yep - I agree it would be best to leave
c/b/ui/views/apps/chrome_app_window_client_views_mac.mm as-is, without a Cocoa
dep. I was thinking of changing it to not implement
ChromeAppWindowClient::CreateNativeAppWindowImpl() directly, but provide access
to ChromeNativeAppWindowViewsMac (i.e. so there's only one place that does `new
ChromeNativeAppWindowViewsMac`). But I just toyed with that, and I don't think
there's a way to do it without #ifdefs which we don't want.

Then my only objection is that having two files called
chrome_app_window_client_views_mac.mm would be confusing :).

How about renaming to chrome_app_window_client_views_cocoa.mm?, then I can just
alter the deps rule to match on "_views_" so it gets views_cocoa and views_mac.
views_cocoa is a good substring for files that can swap in both cocoa and views
implementations at runtime (although it feels a little bit like a contradiction
to have both).

[jackhou1, 2015/06/05 02:48:42]

Done.

+#include "chrome/common/chrome_switches.h"
+
+bool UseMacViewsNativeAppWindows() {

[tapted, 2015/06/04 04:48:00]

anonymous namespace

[jackhou1, 2015/06/04 06:06:40]

Done.

+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kEnableMacViewsNativeAppWindows))
+    return true;
+  if (command_line->HasSwitch(switches::kDisableMacViewsNativeAppWindows))
+    return false;
+  return false;  // Current default.
+}
 
 // static
 extensions::NativeAppWindow* ChromeAppWindowClient::CreateNativeAppWindowImpl(
     extensions::AppWindow* app_window,
     const extensions::AppWindow::CreateParams& params) {
+  if (UseMacViewsNativeAppWindows()) {
+    ChromeNativeAppWindowViewsMac* window = new ChromeNativeAppWindowViewsMac;
+    window->Init(app_window, params);
+    return window;
+  }
+
   return new NativeAppWindowCocoa(app_window, params);
 }