| 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/mojo_runner_util.h" |
| 8 #include "chrome/browser/ui/views/frame/browser_frame_ashwin.h" | 9 #include "chrome/browser/ui/views/frame/browser_frame_ashwin.h" |
| 9 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" | 10 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" |
| 11 #include "chrome/browser/ui/views/frame/mus_browser_frame.h" |
| 10 | 12 |
| 11 NativeBrowserFrame* NativeBrowserFrameFactory::Create( | 13 NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
| 12 BrowserFrame* browser_frame, | 14 BrowserFrame* browser_frame, |
| 13 BrowserView* browser_view) { | 15 BrowserView* browser_view) { |
| 16 if (IsRunningInMojoRunner()) |
| 17 return new MusBrowserFrame(browser_frame, browser_view); |
| 18 |
| 14 if (ShouldCreateForAshDesktop(browser_view)) | 19 if (ShouldCreateForAshDesktop(browser_view)) |
| 15 return new BrowserFrameAshWin(browser_frame, browser_view); | 20 return new BrowserFrameAshWin(browser_frame, browser_view); |
| 16 | 21 |
| 17 return new DesktopBrowserFrameAura(browser_frame, browser_view); | 22 return new DesktopBrowserFrameAura(browser_frame, browser_view); |
| 18 } | 23 } |
| 19 | 24 |
| 20 // static | 25 // static |
| 21 chrome::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType( | 26 chrome::HostDesktopType NativeBrowserFrameFactory::AdjustHostDesktopType( |
| 22 chrome::HostDesktopType desktop_type) { | 27 chrome::HostDesktopType desktop_type) { |
| 23 if (ash::Shell::HasInstance()) | 28 if (ash::Shell::HasInstance()) |
| 24 return chrome::HOST_DESKTOP_TYPE_ASH; | 29 return chrome::HOST_DESKTOP_TYPE_ASH; |
| 25 | 30 |
| 26 return desktop_type; | 31 return desktop_type; |
| 27 } | 32 } |
| OLD | NEW |