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/browser.h" | 7 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" |
8 #include "chrome/browser/ui/views/frame/browser_view.h" | |
9 | 8 |
10 #if defined(USE_ASH) | 9 #if defined(USE_ASH) |
11 #include "ash/wm/window_util.h" | |
12 #include "chrome/browser/ui/ash/ash_init.h" | |
13 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" | 10 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" |
14 #endif | 11 #endif |
15 | 12 |
16 #if !defined(OS_CHROMEOS) | |
17 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h" | |
18 #endif | |
19 | |
20 NativeBrowserFrame* NativeBrowserFrameFactory::Create( | 13 NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
21 BrowserFrame* browser_frame, | 14 BrowserFrame* browser_frame, |
22 BrowserView* browser_view) { | 15 BrowserView* browser_view) { |
23 #if defined(OS_CHROMEOS) | |
24 return new BrowserFrameAsh(browser_frame, browser_view); | |
25 #else | |
26 #if defined(USE_ASH) | 16 #if defined(USE_ASH) |
27 if (chrome::ShouldOpenAshOnStartup() || | 17 if (ShouldCreateForAshDesktop(browser_view)) |
28 browser_view->browser()-> | |
29 host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) { | |
30 return new BrowserFrameAsh(browser_frame, browser_view); | 18 return new BrowserFrameAsh(browser_frame, browser_view); |
31 } | 19 #endif |
32 #endif // USE_ASH | |
33 return new DesktopBrowserFrameAura(browser_frame, browser_view); | 20 return new DesktopBrowserFrameAura(browser_frame, browser_view); |
34 #endif | |
35 } | 21 } |
36 | |
OLD | NEW |