| 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 "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "chrome/browser/ui/views/frame/browser_frame_ashwin.h" | |
| 9 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" | 8 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" |
| 10 | 9 |
| 11 #if defined(MOJO_SHELL_CLIENT) | 10 #if defined(MOJO_SHELL_CLIENT) |
| 12 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" | 11 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" |
| 13 #include "content/public/common/mojo_shell_connection.h" | 12 #include "content/public/common/mojo_shell_connection.h" |
| 14 #endif | 13 #endif |
| 15 | 14 |
| 16 NativeBrowserFrame* NativeBrowserFrameFactory::Create( | 15 NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
| 17 BrowserFrame* browser_frame, | 16 BrowserFrame* browser_frame, |
| 18 BrowserView* browser_view) { | 17 BrowserView* browser_view) { |
| 19 #if defined(MOJO_SHELL_CLIENT) | 18 #if defined(MOJO_SHELL_CLIENT) |
| 20 if (content::MojoShellConnection::Get()) | 19 if (content::MojoShellConnection::Get()) |
| 21 return new BrowserFrameMus(browser_frame, browser_view); | 20 return new BrowserFrameMus(browser_frame, browser_view); |
| 22 #endif | 21 #endif |
| 23 | 22 |
| 24 if (ShouldCreateForAshDesktop(browser_view)) | |
| 25 return new BrowserFrameAshWin(browser_frame, browser_view); | |
| 26 | |
| 27 return new DesktopBrowserFrameAura(browser_frame, browser_view); | 23 return new DesktopBrowserFrameAura(browser_frame, browser_view); |
| 28 } | 24 } |
| 29 | |
| 30 // static | |
| 31 chrome::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType( | |
| 32 chrome::HostDesktopType desktop_type) { | |
| 33 if (ash::Shell::HasInstance()) | |
| 34 return chrome::HOST_DESKTOP_TYPE_ASH; | |
| 35 | |
| 36 return desktop_type; | |
| 37 } | |
| OLD | NEW |