Index: chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc |
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc |
index 36ae1b354781ceed402657ff32ed422595231423..d708bc6b36c907dc5b7a2a0da794b74a77ad77af 100644 |
--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc |
+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc |
@@ -17,6 +17,10 @@ |
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" |
#endif |
+#if defined(OS_WIN) |
sky
2013/11/14 15:28:42
Oy, what a sea of ifdefs. I think it's time for au
tapted
2013/11/15 12:47:11
Done. Fluctuated a lot with the various permutatio
|
+#include "chrome/browser/ui/views/frame/browser_frame_ash_win.h" |
+#endif |
+ |
NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
BrowserFrame* browser_frame, |
BrowserView* browser_view) { |
@@ -27,7 +31,11 @@ NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
if (chrome::ShouldOpenAshOnStartup() || |
browser_view->browser()-> |
host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) { |
+#if defined(OS_WIN) |
+ return new BrowserFrameAshWin(browser_frame, browser_view); |
+#else |
return new BrowserFrameAsh(browser_frame, browser_view); |
+#endif |
} |
#endif // USE_ASH |
return new DesktopBrowserFrameAura(browser_frame, browser_view); |