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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2559343003: mus: Rename GpuService to Gpu. (Closed)
Patch Set: . Created 4 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 #if defined(TOOLKIT_VIEWS) 266 #if defined(TOOLKIT_VIEWS)
267 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 267 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
268 #endif 268 #endif
269 269
270 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 270 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
271 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" 271 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
272 #endif 272 #endif
273 273
274 #if defined(USE_AURA) 274 #if defined(USE_AURA)
275 #include "services/service_manager/runner/common/client_util.h" 275 #include "services/service_manager/runner/common/client_util.h"
276 #include "services/ui/public/cpp/gpu/gpu_service.h" 276 #include "services/ui/public/cpp/gpu/gpu.h"
277 #include "ui/views/mus/window_manager_connection.h" 277 #include "ui/views/mus/window_manager_connection.h"
278 #endif 278 #endif
279 279
280 #if defined(USE_ASH) 280 #if defined(USE_ASH)
281 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 281 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
282 #endif 282 #endif
283 283
284 #if defined(USE_X11) 284 #if defined(USE_X11)
285 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" 285 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
286 #endif 286 #endif
(...skipping 2425 matching lines...) Expand 10 before | Expand all | Expand 10 after
2712 ++iter; 2712 ++iter;
2713 } 2713 }
2714 #endif 2714 #endif
2715 return NULL; 2715 return NULL;
2716 } 2716 }
2717 2717
2718 gpu::GpuChannelEstablishFactory* 2718 gpu::GpuChannelEstablishFactory*
2719 ChromeContentBrowserClient::GetGpuChannelEstablishFactory() { 2719 ChromeContentBrowserClient::GetGpuChannelEstablishFactory() {
2720 #if defined(USE_AURA) 2720 #if defined(USE_AURA)
2721 if (views::WindowManagerConnection::Exists()) 2721 if (views::WindowManagerConnection::Exists())
2722 return views::WindowManagerConnection::Get()->gpu_service(); 2722 return views::WindowManagerConnection::Get()->gpu();
2723 #endif 2723 #endif
2724 return nullptr; 2724 return nullptr;
2725 } 2725 }
2726 2726
2727 bool ChromeContentBrowserClient::AllowPepperSocketAPI( 2727 bool ChromeContentBrowserClient::AllowPepperSocketAPI(
2728 content::BrowserContext* browser_context, 2728 content::BrowserContext* browser_context,
2729 const GURL& url, 2729 const GURL& url,
2730 bool private_api, 2730 bool private_api,
2731 const content::SocketPermissionRequest* params) { 2731 const content::SocketPermissionRequest* params) {
2732 #if BUILDFLAG(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS) 2732 #if BUILDFLAG(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS)
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
3319 render_frame_host, std::move(source), std::move(request)); 3319 render_frame_host, std::move(source), std::move(request));
3320 #else 3320 #else
3321 // Chrome's media remoting implementation depends on the Media Router 3321 // Chrome's media remoting implementation depends on the Media Router
3322 // infrastructure to identify remote sinks and provide the user interface for 3322 // infrastructure to identify remote sinks and provide the user interface for
3323 // sink selection. In the case where the Media Router is not present, simply 3323 // sink selection. In the case where the Media Router is not present, simply
3324 // drop the interface request. This will prevent code paths for media remoting 3324 // drop the interface request. This will prevent code paths for media remoting
3325 // in the renderer process from activating. 3325 // in the renderer process from activating.
3326 #endif 3326 #endif
3327 } 3327 }
3328 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) 3328 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING)
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698