| 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/browser_frame_mus.h" | 7 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" |
| 8 #include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h" | 8 #include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h" |
| 9 #include "services/shell/runner/common/client_util.h" | 9 #include "services/shell/runner/common/client_util.h" |
| 10 | 10 |
| 11 NativeBrowserFrame* NativeBrowserFrameFactory::Create( | 11 NativeBrowserFrame* NativeBrowserFrameFactory::Create( |
| 12 BrowserFrame* browser_frame, | 12 BrowserFrame* browser_frame, |
| 13 BrowserView* browser_view) { | 13 BrowserView* browser_view) { |
| 14 if (shell::ShellIsRemote()) | 14 if (shell::ShellIsRemote()) |
| 15 return new BrowserFrameMus(browser_frame, browser_view); | 15 return new BrowserFrameMus(browser_frame, browser_view); |
| 16 |
| 17 #if defined(USE_OZONE) |
| 18 NOTREACHED() << "For Ozone builds, --mash is being targeted, and " |
| 19 << "the 'if' clause above would have taken place."; |
| 20 return nullptr; |
| 21 #else |
| 16 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view); | 22 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view); |
| 23 #endif |
| 17 } | 24 } |
| OLD | NEW |