| 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_auralinux.h" | 7 #include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h" |
| 8 | 8 |
| 9 #if defined(USE_ASH) | |
| 10 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" | |
| 11 #endif | |
| 12 | |
| 13 #if defined(MOJO_SHELL_CLIENT) | 9 #if defined(MOJO_SHELL_CLIENT) |
| 14 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" | 10 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" |
| 15 #include "content/public/common/mojo_shell_connection.h" | 11 #include "content/public/common/mojo_shell_connection.h" |
| 16 #endif | 12 #endif |
| 17 | 13 |
| 18 NativeBrowserFrame* NativeBrowserFrameFactory::Create( | 14 NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
| 19 BrowserFrame* browser_frame, | 15 BrowserFrame* browser_frame, |
| 20 BrowserView* browser_view) { | 16 BrowserView* browser_view) { |
| 21 #if defined(MOJO_SHELL_CLIENT) | 17 #if defined(MOJO_SHELL_CLIENT) |
| 22 if (content::MojoShellConnection::Get()) | 18 if (content::MojoShellConnection::Get()) |
| 23 return new BrowserFrameMus(browser_frame, browser_view); | 19 return new BrowserFrameMus(browser_frame, browser_view); |
| 24 #endif | 20 #endif |
| 25 | 21 |
| 26 #if defined(USE_ASH) | |
| 27 if (ShouldCreateForAshDesktop(browser_view)) | |
| 28 return new BrowserFrameAsh(browser_frame, browser_view); | |
| 29 #endif | |
| 30 | |
| 31 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view); | 22 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view); |
| 32 } | 23 } |
| OLD | NEW |