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

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

Issue 2184943002: services/ui: Move some files into the client lib. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-gpu-in-mus-windows
Patch Set: . Created 4 years, 4 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
« no previous file with comments | « chrome/browser/DEPS ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 #if defined(TOOLKIT_VIEWS) 241 #if defined(TOOLKIT_VIEWS)
242 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 242 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
243 #endif 243 #endif
244 244
245 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 245 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
246 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" 246 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
247 #endif 247 #endif
248 248
249 #if defined(USE_AURA) 249 #if defined(USE_AURA)
250 #include "services/shell/runner/common/client_util.h" 250 #include "services/shell/runner/common/client_util.h"
251 #include "services/ui/common/gpu_service.h" 251 #include "services/ui/public/cpp/gpu_service.h"
252 #include "ui/views/mus/window_manager_connection.h" 252 #include "ui/views/mus/window_manager_connection.h"
253 #endif 253 #endif
254 254
255 #if defined(USE_ASH) 255 #if defined(USE_ASH)
256 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" 256 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
257 #endif 257 #endif
258 258
259 #if defined(USE_X11) 259 #if defined(USE_X11)
260 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" 260 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
261 #endif 261 #endif
(...skipping 2793 matching lines...) Expand 10 before | Expand all | Expand 10 after
3055 if (channel <= kMaxDisableEncryptionChannel) { 3055 if (channel <= kMaxDisableEncryptionChannel) {
3056 static const char* const kWebRtcDevSwitchNames[] = { 3056 static const char* const kWebRtcDevSwitchNames[] = {
3057 switches::kDisableWebRtcEncryption, 3057 switches::kDisableWebRtcEncryption,
3058 }; 3058 };
3059 to_command_line->CopySwitchesFrom(from_command_line, 3059 to_command_line->CopySwitchesFrom(from_command_line,
3060 kWebRtcDevSwitchNames, 3060 kWebRtcDevSwitchNames,
3061 arraysize(kWebRtcDevSwitchNames)); 3061 arraysize(kWebRtcDevSwitchNames));
3062 } 3062 }
3063 } 3063 }
3064 #endif // defined(ENABLE_WEBRTC) 3064 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698