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

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

Issue 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck
Patch Set: Created 6 years, 9 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 (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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 #endif 235 #endif
236 236
237 #if defined(USE_X11) 237 #if defined(USE_X11)
238 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" 238 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
239 #endif 239 #endif
240 240
241 #if defined(ENABLE_SPELLCHECK) 241 #if defined(ENABLE_SPELLCHECK)
242 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 242 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
243 #endif 243 #endif
244 244
245 245 #if defined(ENABLE_SERVICE_DISCOVERY)
246 #if defined(ENABLE_MDNS)
247 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h" 246 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h"
248 #endif 247 #endif
249 248
250 using blink::WebWindowFeatures; 249 using blink::WebWindowFeatures;
251 using base::FileDescriptor; 250 using base::FileDescriptor;
252 using content::AccessTokenStore; 251 using content::AccessTokenStore;
253 using content::BrowserChildProcessHostIterator; 252 using content::BrowserChildProcessHostIterator;
254 using content::BrowserThread; 253 using content::BrowserThread;
255 using content::BrowserURLHandler; 254 using content::BrowserURLHandler;
256 using content::ChildProcessSecurityPolicy; 255 using content::ChildProcessSecurityPolicy;
(...skipping 2310 matching lines...) Expand 10 before | Expand all | Expand 10 after
2567 fileapi::ExternalMountPoints::GetSystemInstance()); 2566 fileapi::ExternalMountPoints::GetSystemInstance());
2568 backend->AddSystemMountPoints(); 2567 backend->AddSystemMountPoints();
2569 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal)); 2568 DCHECK(backend->CanHandleType(fileapi::kFileSystemTypeExternal));
2570 additional_backends->push_back(backend); 2569 additional_backends->push_back(backend);
2571 #endif 2570 #endif
2572 2571
2573 additional_backends->push_back( 2572 additional_backends->push_back(
2574 new sync_file_system::SyncFileSystemBackend( 2573 new sync_file_system::SyncFileSystemBackend(
2575 Profile::FromBrowserContext(browser_context))); 2574 Profile::FromBrowserContext(browser_context)));
2576 2575
2577 #if defined(ENABLE_MDNS) 2576 #if defined(ENABLE_SERVICE_DISCOVERY)
2578 if (CommandLine::ForCurrentProcess()->HasSwitch( 2577 if (CommandLine::ForCurrentProcess()->HasSwitch(
2579 switches::kEnablePrivetStorage)) { 2578 switches::kEnablePrivetStorage)) {
2580 additional_backends->push_back( 2579 additional_backends->push_back(
2581 new local_discovery::PrivetFileSystemBackend( 2580 new local_discovery::PrivetFileSystemBackend(
2582 fileapi::ExternalMountPoints::GetSystemInstance(), 2581 fileapi::ExternalMountPoints::GetSystemInstance(),
2583 browser_context)); 2582 browser_context));
2584 } 2583 }
2585 #endif 2584 #endif
2586 } 2585 }
2587 2586
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
2731 switches::kDisableWebRtcEncryption, 2730 switches::kDisableWebRtcEncryption,
2732 }; 2731 };
2733 to_command_line->CopySwitchesFrom(from_command_line, 2732 to_command_line->CopySwitchesFrom(from_command_line,
2734 kWebRtcDevSwitchNames, 2733 kWebRtcDevSwitchNames,
2735 arraysize(kWebRtcDevSwitchNames)); 2734 arraysize(kWebRtcDevSwitchNames));
2736 } 2735 }
2737 } 2736 }
2738 #endif // defined(ENABLE_WEBRTC) 2737 #endif // defined(ENABLE_WEBRTC)
2739 2738
2740 } // namespace chrome 2739 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698