| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/services/gcm/gcm_desktop_utils.h" | 5 #include "chrome/browser/services/gcm/gcm_desktop_utils.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/sequenced_task_runner.h" | 8 #include "base/sequenced_task_runner.h" |
| 9 #include "base/threading/sequenced_worker_pool.h" | 9 #include "base/threading/sequenced_worker_pool.h" |
| 10 #include "chrome/common/chrome_version_info.h" | 10 #include "chrome/common/chrome_version_info.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 chrome_build_info.platform = GetPlatform(); | 66 chrome_build_info.platform = GetPlatform(); |
| 67 chrome_build_info.channel = GetChannel(); | 67 chrome_build_info.channel = GetChannel(); |
| 68 chrome_build_info.version = GetVersion(); | 68 chrome_build_info.version = GetVersion(); |
| 69 return chrome_build_info; | 69 return chrome_build_info; |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace | 72 } // namespace |
| 73 | 73 |
| 74 scoped_ptr<GCMDriver> CreateGCMDriverDesktop( | 74 scoped_ptr<GCMDriver> CreateGCMDriverDesktop( |
| 75 scoped_ptr<GCMClientFactory> gcm_client_factory, | 75 scoped_ptr<GCMClientFactory> gcm_client_factory, |
| 76 PrefService* prefs, | |
| 77 const base::FilePath& store_path, | 76 const base::FilePath& store_path, |
| 78 const scoped_refptr<net::URLRequestContextGetter>& request_context) { | 77 const scoped_refptr<net::URLRequestContextGetter>& request_context) { |
| 79 scoped_refptr<base::SequencedWorkerPool> worker_pool( | 78 scoped_refptr<base::SequencedWorkerPool> worker_pool( |
| 80 content::BrowserThread::GetBlockingPool()); | 79 content::BrowserThread::GetBlockingPool()); |
| 81 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner( | 80 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner( |
| 82 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( | 81 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( |
| 83 worker_pool->GetSequenceToken(), | 82 worker_pool->GetSequenceToken(), |
| 84 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); | 83 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
| 85 return scoped_ptr<GCMDriver>(new GCMDriverDesktop( | 84 return scoped_ptr<GCMDriver>(new GCMDriverDesktop( |
| 86 gcm_client_factory.Pass(), | 85 gcm_client_factory.Pass(), |
| 87 GetChromeBuildInfo(), | 86 GetChromeBuildInfo(), |
| 88 prefs, | |
| 89 store_path, | 87 store_path, |
| 90 request_context, | 88 request_context, |
| 91 content::BrowserThread::GetMessageLoopProxyForThread( | 89 content::BrowserThread::GetMessageLoopProxyForThread( |
| 92 content::BrowserThread::UI), | 90 content::BrowserThread::UI), |
| 93 content::BrowserThread::GetMessageLoopProxyForThread( | 91 content::BrowserThread::GetMessageLoopProxyForThread( |
| 94 content::BrowserThread::IO), | 92 content::BrowserThread::IO), |
| 95 blocking_task_runner)); | 93 blocking_task_runner)); |
| 96 } | 94 } |
| 97 | 95 |
| 98 } // namespace gcm | 96 } // namespace gcm |
| OLD | NEW |