Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(287)

Side by Side Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)
Patch Set: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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)
rjkroege 2016/10/11 18:49:47 this looks strange. i.e.: something is not right h
sadrul 2016/10/11 19:14:14 What happens if you use this piece of code with oz
tonikitoo 2016/10/12 13:44:23 In patchset #3, in if you look at chrome/browser/u
16 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view); 18 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view);
19 #else
20 return nullptr;
21 #endif
17 } 22 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698