Work on USE_ASH/USE_AURA split.

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
index b093e86d577348e25262fafa9267e39c4836cca8..ce5b162b49e46a178b9bf8f8e1ae3dd945edf358 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
@@ -2,13 +2,17 @@
 // 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_aura.h"
-
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_browser_view.h"
-#include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
+#if defined(USE_ASH)
+#include "chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h"
+#include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h"
+#else
+#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
+#endif
+
 namespace browser {
 
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
@@ -18,6 +22,7 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
         frame, static_cast<PanelBrowserView*>(browser_view));
   }
 
+#if defined(USE_ASH)
   // If this is an app window and it's maximized, use the special frame_view.
   if (browser_view->browser()->is_app() &&
       browser_view->browser()->app_type() != Browser::APP_TYPE_CHILD &&
@@ -25,9 +30,13 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     return new AppNonClientFrameViewAura(frame, browser_view);
 
   // Default is potentially translucent fancy frames.
-  BrowserNonClientFrameViewAura* frame_view =
-      new BrowserNonClientFrameViewAura(frame, browser_view);
+  BrowserNonClientFrameViewAsh* frame_view =
+      new BrowserNonClientFrameViewAsh(frame, browser_view);
   frame_view->Init();
+#else
+  OpaqueBrowserFrameView* frame_view =
+      new OpaqueBrowserFrameView(frame, browser_view);
+#endif
   return frame_view;
 }