Ash Flag on Linux: Modified and Renamed Factory Files

chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
similarity index 62%
rename from chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc
rename to chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
index c7ae34f021c8bc9649282b5e62439c4aa515da25..c8f1b1fa7bb81e03d189c7bf590e78c77e3928c5 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
-
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
+#if defined(USE_ASH)
+#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
+#endif
+
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #endif
@@ -19,21 +21,22 @@ namespace chrome {
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame,
     BrowserView* browser_view) {
-#if !defined(OS_CHROMEOS)
-  if (browser_view->browser()->host_desktop_type() ==
+#if defined(OS_CHROMEOS) && defined(USE_ASH)

[benwells, 2015/12/07 05:03:22]

This isn't logically equivalent - windows and linux should be able to create
BrowserNonClientFrameViewAsh if USE_ASH is defined.

As pointed out on the other CL by estade@, host_desktop_type and
DESKTOP_TYPE_NATIVE should always be defined, so you don't need to change this
so dramatically. You should be able to just wrap the
BrowserNonClientFrameViewAsh* creation at the end of the original version in #if
USE_ASH, and add something like NOTREACHED(); return nullptr in the #else (or
something like that).

[wierichs, 2015/12/07 23:49:39]

Done.

+  if (browser_view->browser()->host_desktop_type() !=
       chrome::HOST_DESKTOP_TYPE_NATIVE) {
-#if defined(OS_WIN)
-    if (frame->ShouldUseNativeFrame())
-      return new GlassBrowserFrameView(frame, browser_view);
-#endif
-    return new OpaqueBrowserFrameView(frame, browser_view);
+    BrowserNonClientFrameViewAsh* frame_view =
+        new BrowserNonClientFrameViewAsh(frame, browser_view);
+    frame_view->Init();
+
+    return frame_view;
   }
 #endif
 
-  BrowserNonClientFrameViewAsh* frame_view =
-      new BrowserNonClientFrameViewAsh(frame, browser_view);
-  frame_view->Init();
-  return frame_view;
+#if defined(OS_WIN)
+  if (frame->ShouldUseNativeFrame())
+    return new GlassBrowserFrameView(frame, browser_view);
+#endif
+  return new OpaqueBrowserFrameView(frame, browser_view);
 }
 
 }  // namespace chrome