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

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

Issue 1442893002: Move Shell connection to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@i2
Patch Set: . Created 5 years, 1 month 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/mojo_runner_util.h"
8 #include "chrome/browser/ui/views/frame/browser_frame_ash.h" 7 #include "chrome/browser/ui/views/frame/browser_frame_ash.h"
9 #include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h" 8 #include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h"
10 9
11 #if defined(MOJO_RUNNER_CLIENT) 10 #if defined(MOJO_SHELL_CLIENT)
12 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" 11 #include "chrome/browser/ui/views/frame/browser_frame_mus.h"
12 #include "content/public/common/mojo_shell_connection.h"
13 #endif 13 #endif
14 14
15 NativeBrowserFrame* NativeBrowserFrameFactory::Create( 15 NativeBrowserFrame* NativeBrowserFrameFactory::Create(
16 BrowserFrame* browser_frame, 16 BrowserFrame* browser_frame,
17 BrowserView* browser_view) { 17 BrowserView* browser_view) {
18 #if defined(MOJO_RUNNER_CLIENT) 18 #if defined(MOJO_SHELL_CLIENT)
19 if (IsRunningInMojoRunner()) 19 if (content::MojoShellConnection::Get())
20 return new BrowserFrameMus(browser_frame, browser_view); 20 return new BrowserFrameMus(browser_frame, browser_view);
21 #endif 21 #endif
22 22
23 if (ShouldCreateForAshDesktop(browser_view)) 23 if (ShouldCreateForAshDesktop(browser_view))
24 return new BrowserFrameAsh(browser_frame, browser_view); 24 return new BrowserFrameAsh(browser_frame, browser_view);
25 25
26 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view); 26 return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view);
27 } 27 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698