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