| OLD | NEW |
| 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 #if defined(TOOLKIT_VIEWS) | 260 #if defined(TOOLKIT_VIEWS) |
| 261 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" | 261 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" |
| 262 #endif | 262 #endif |
| 263 | 263 |
| 264 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 264 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 265 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" | 265 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" |
| 266 #endif | 266 #endif |
| 267 | 267 |
| 268 #if defined(USE_AURA) | 268 #if defined(USE_AURA) |
| 269 #include "services/service_manager/runner/common/client_util.h" | 269 #include "services/service_manager/runner/common/client_util.h" |
| 270 #include "services/ui/public/cpp/gpu_service.h" | 270 #include "services/ui/public/cpp/gpu/gpu_service.h" |
| 271 #include "ui/views/mus/window_manager_connection.h" | 271 #include "ui/views/mus/window_manager_connection.h" |
| 272 #endif | 272 #endif |
| 273 | 273 |
| 274 #if defined(USE_ASH) | 274 #if defined(USE_ASH) |
| 275 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" | 275 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" |
| 276 #endif | 276 #endif |
| 277 | 277 |
| 278 #if defined(USE_X11) | 278 #if defined(USE_X11) |
| 279 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" | 279 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" |
| 280 #endif | 280 #endif |
| (...skipping 2995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3276 render_frame_host, std::move(source), std::move(request)); | 3276 render_frame_host, std::move(source), std::move(request)); |
| 3277 #else | 3277 #else |
| 3278 // Chrome's media remoting implementation depends on the Media Router | 3278 // Chrome's media remoting implementation depends on the Media Router |
| 3279 // infrastructure to identify remote sinks and provide the user interface for | 3279 // infrastructure to identify remote sinks and provide the user interface for |
| 3280 // sink selection. In the case where the Media Router is not present, simply | 3280 // sink selection. In the case where the Media Router is not present, simply |
| 3281 // drop the interface request. This will prevent code paths for media remoting | 3281 // drop the interface request. This will prevent code paths for media remoting |
| 3282 // in the renderer process from activating. | 3282 // in the renderer process from activating. |
| 3283 #endif | 3283 #endif |
| 3284 } | 3284 } |
| 3285 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) | 3285 #endif // BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| OLD | NEW |