| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" | 5 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" | 7 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" |
| 8 | 8 |
| 9 #if defined(USE_ASH) | 9 #if defined(USE_ASH) |
| 10 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" | 10 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 NativeBrowserFrame* NativeBrowserFrameFactory::Create( | 13 NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
| 14 BrowserFrame* browser_frame, | 14 BrowserFrame* browser_frame, |
| 15 BrowserView* browser_view) { | 15 BrowserView* browser_view) { |
| 16 #if defined(USE_ASH) | 16 #if defined(USE_ASH) |
| 17 if (ShouldCreateForAshDesktop(browser_view)) | 17 if (ShouldCreateForAshDesktop(browser_view)) |
| 18 return new BrowserFrameAsh(browser_frame, browser_view); | 18 return new BrowserFrameAsh(browser_frame, browser_view); |
| 19 #endif | 19 #endif |
| 20 return new DesktopBrowserFrameAura(browser_frame, browser_view); | 20 return new DesktopBrowserFrameAura(browser_frame, browser_view); |
| 21 } | 21 } |
| OLD | NEW |