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_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1179 // Set up a task to delete old WebRTC log files for all profiles. Use a delay | 1179 // Set up a task to delete old WebRTC log files for all profiles. Use a delay |
1180 // to reduce the impact on startup time. | 1180 // to reduce the impact on startup time. |
1181 BrowserThread::PostDelayedTask( | 1181 BrowserThread::PostDelayedTask( |
1182 BrowserThread::UI, | 1182 BrowserThread::UI, |
1183 FROM_HERE, | 1183 FROM_HERE, |
1184 base::Bind(&WebRtcLogUtil::DeleteOldWebRtcLogFilesForAllProfiles), | 1184 base::Bind(&WebRtcLogUtil::DeleteOldWebRtcLogFilesForAllProfiles), |
1185 base::TimeDelta::FromMinutes(1)); | 1185 base::TimeDelta::FromMinutes(1)); |
1186 #endif // defined(ENABLE_WEBRTC) | 1186 #endif // defined(ENABLE_WEBRTC) |
1187 | 1187 |
1188 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 1188 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 1189 // WebUSB is an experimental web API. The sites these notifications will link |
| 1190 // to will only work if the experiment is enabled. |
1189 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1191 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
1190 switches::kEnableWebUsbNotifications)) { | 1192 switches::kEnableExperimentalWebPlatformFeatures)) { |
1191 webusb_browser_client_.reset(new ChromeWebUsbBrowserClient()); | 1193 webusb_browser_client_.reset(new ChromeWebUsbBrowserClient()); |
1192 webusb_detector_.reset( | 1194 webusb_detector_.reset( |
1193 new webusb::WebUsbDetector(webusb_browser_client_.get())); | 1195 new webusb::WebUsbDetector(webusb_browser_client_.get())); |
1194 } | 1196 } |
1195 #endif | 1197 #endif |
1196 | 1198 |
1197 // At this point, StartupBrowserCreator::Start has run creating initial | 1199 // At this point, StartupBrowserCreator::Start has run creating initial |
1198 // browser windows and tabs, but no progress has been made in loading | 1200 // browser windows and tabs, but no progress has been made in loading |
1199 // content as the main message loop hasn't started processing tasks yet. | 1201 // content as the main message loop hasn't started processing tasks yet. |
1200 // We setup to observe to the initial page load here to defer running | 1202 // We setup to observe to the initial page load here to defer running |
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1848 chromeos::CrosSettings::Shutdown(); | 1850 chromeos::CrosSettings::Shutdown(); |
1849 #endif // defined(OS_CHROMEOS) | 1851 #endif // defined(OS_CHROMEOS) |
1850 #endif // defined(OS_ANDROID) | 1852 #endif // defined(OS_ANDROID) |
1851 } | 1853 } |
1852 | 1854 |
1853 // Public members: | 1855 // Public members: |
1854 | 1856 |
1855 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1857 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1856 chrome_extra_parts_.push_back(parts); | 1858 chrome_extra_parts_.push_back(parts); |
1857 } | 1859 } |
OLD | NEW |