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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/browser/ui/views/frame/browser_view.h" 6 #include "chrome/browser/ui/views/frame/browser_view.h"
7 7
8 #if defined(USE_AURA) 8 #if defined(USE_AURA)
9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h" 9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h"
10 #include "services/service_manager/runner/common/client_util.h" 10 #include "services/service_manager/runner/common/client_util.h"
(...skipping 10 matching lines...) Expand all
21 #if defined(USE_ASH) 21 #if defined(USE_ASH)
22 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h" 22 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
23 #endif 23 #endif
24 24
25 namespace chrome { 25 namespace chrome {
26 26
27 BrowserNonClientFrameView* CreateBrowserNonClientFrameView( 27 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
28 BrowserFrame* frame, 28 BrowserFrame* frame,
29 BrowserView* browser_view) { 29 BrowserView* browser_view) {
30 #if defined(USE_AURA) 30 #if defined(USE_AURA)
31 if (shell::ShellIsRemote()) { 31 if (service_manager::ServiceManagerIsRemote()) {
32 BrowserNonClientFrameViewMus* frame_view = 32 BrowserNonClientFrameViewMus* frame_view =
33 new BrowserNonClientFrameViewMus(frame, browser_view); 33 new BrowserNonClientFrameViewMus(frame, browser_view);
34 frame_view->Init(); 34 frame_view->Init();
35 return frame_view; 35 return frame_view;
36 } 36 }
37 #endif 37 #endif
38 #if defined(USE_ASH) 38 #if defined(USE_ASH)
39 BrowserNonClientFrameViewAsh* frame_view = 39 BrowserNonClientFrameViewAsh* frame_view =
40 new BrowserNonClientFrameViewAsh(frame, browser_view); 40 new BrowserNonClientFrameViewAsh(frame, browser_view);
41 frame_view->Init(); 41 frame_view->Init();
42 return frame_view; 42 return frame_view;
43 #else 43 #else
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 if (frame->ShouldUseNativeFrame()) 45 if (frame->ShouldUseNativeFrame())
46 return new GlassBrowserFrameView(frame, browser_view); 46 return new GlassBrowserFrameView(frame, browser_view);
47 #endif 47 #endif
48 return new OpaqueBrowserFrameView(frame, browser_view); 48 return new OpaqueBrowserFrameView(frame, browser_view);
49 #endif // USE_ASH 49 #endif // USE_ASH
50 } 50 }
51 51
52 } // namespace chrome 52 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698