Update to Chromium revision 275973.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1743 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-06-12 20:28:58 +00:00
parent 4e0dddcfa8
commit de5b859c0a
36 changed files with 188 additions and 175 deletions

View File

@@ -31,6 +31,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
// BrowserProcess implementation.
virtual void ResourceDispatcherHostCreated() OVERRIDE;
virtual void EndSession() OVERRIDE;
virtual MetricsServicesManager* GetMetricsServicesManager() OVERRIDE;
virtual MetricsService* metrics_service() OVERRIDE;
virtual rappor::RapporService* rappor_service() OVERRIDE;
virtual IOThread* io_thread() OVERRIDE;
@@ -91,7 +92,8 @@ class ChromeBrowserProcessStub : public BrowserProcess {
#if defined(ENABLE_WEBRTC)
virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
#endif
virtual NetworkTimeTracker* network_time_tracker() OVERRIDE;
virtual network_time::NetworkTimeTracker* network_time_tracker() OVERRIDE;
virtual gcm::GCMDriver* gcm_driver() OVERRIDE;
private:
std::string locale_;