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/service/cloud_print/cloud_print_proxy_backend.h" | 5 #include "chrome/service/cloud_print/cloud_print_proxy_backend.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
15 #include "base/location.h" | 15 #include "base/location.h" |
16 #include "base/macros.h" | 16 #include "base/macros.h" |
17 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
18 #include "base/rand_util.h" | 18 #include "base/rand_util.h" |
19 #include "base/single_thread_task_runner.h" | |
20 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
21 #include "base/threading/thread_task_runner_handle.h" | 20 #include "base/threading/thread_task_runner_handle.h" |
22 #include "base/values.h" | 21 #include "base/values.h" |
23 #include "chrome/common/cloud_print/cloud_print_constants.h" | 22 #include "chrome/common/cloud_print/cloud_print_constants.h" |
24 #include "chrome/service/cloud_print/cloud_print_auth.h" | 23 #include "chrome/service/cloud_print/cloud_print_auth.h" |
25 #include "chrome/service/cloud_print/cloud_print_connector.h" | 24 #include "chrome/service/cloud_print/cloud_print_connector.h" |
26 #include "chrome/service/cloud_print/cloud_print_service_helpers.h" | 25 #include "chrome/service/cloud_print/cloud_print_service_helpers.h" |
27 #include "chrome/service/cloud_print/cloud_print_token_store.h" | 26 #include "chrome/service/cloud_print/cloud_print_token_store.h" |
28 #include "chrome/service/cloud_print/connector_settings.h" | 27 #include "chrome/service/cloud_print/connector_settings.h" |
29 #include "chrome/service/net/service_url_request_context_getter.h" | 28 #include "chrome/service/net/service_url_request_context_getter.h" |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 | 165 |
167 DISALLOW_COPY_AND_ASSIGN(Core); | 166 DISALLOW_COPY_AND_ASSIGN(Core); |
168 }; | 167 }; |
169 | 168 |
170 CloudPrintProxyBackend::CloudPrintProxyBackend( | 169 CloudPrintProxyBackend::CloudPrintProxyBackend( |
171 CloudPrintProxyFrontend* frontend, | 170 CloudPrintProxyFrontend* frontend, |
172 const ConnectorSettings& settings, | 171 const ConnectorSettings& settings, |
173 const gaia::OAuthClientInfo& oauth_client_info, | 172 const gaia::OAuthClientInfo& oauth_client_info, |
174 bool enable_job_poll) | 173 bool enable_job_poll) |
175 : core_thread_("Chrome_CloudPrintProxyCoreThread"), | 174 : core_thread_("Chrome_CloudPrintProxyCoreThread"), |
176 frontend_loop_(base::MessageLoop::current()), | 175 frontend_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
177 frontend_(frontend) { | 176 frontend_(frontend) { |
178 DCHECK(frontend_); | 177 DCHECK(frontend_); |
179 core_ = new Core(this, settings, oauth_client_info, enable_job_poll); | 178 core_ = new Core(this, settings, oauth_client_info, enable_job_poll); |
180 } | 179 } |
181 | 180 |
182 CloudPrintProxyBackend::~CloudPrintProxyBackend() { DCHECK(!core_.get()); } | 181 CloudPrintProxyBackend::~CloudPrintProxyBackend() { DCHECK(!core_.get()); } |
183 | 182 |
184 bool CloudPrintProxyBackend::InitializeWithToken( | 183 bool CloudPrintProxyBackend::InitializeWithToken( |
185 const std::string& cloud_print_token) { | 184 const std::string& cloud_print_token) { |
186 if (!core_thread_.Start()) | 185 if (!core_thread_.Start()) |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 job_poll_scheduled_(false), | 244 job_poll_scheduled_(false), |
246 enable_job_poll_(enable_job_poll), | 245 enable_job_poll_(enable_job_poll), |
247 xmpp_ping_scheduled_(false), | 246 xmpp_ping_scheduled_(false), |
248 pending_xmpp_pings_(0) { | 247 pending_xmpp_pings_(0) { |
249 settings_.CopyFrom(settings); | 248 settings_.CopyFrom(settings); |
250 } | 249 } |
251 | 250 |
252 bool CloudPrintProxyBackend::Core::PostFrontendTask( | 251 bool CloudPrintProxyBackend::Core::PostFrontendTask( |
253 const tracked_objects::Location& from_here, | 252 const tracked_objects::Location& from_here, |
254 const base::Closure& task) { | 253 const base::Closure& task) { |
255 return backend_->frontend_loop_->task_runner()->PostTask(from_here, task); | 254 return backend_->frontend_task_runner_->PostTask(from_here, task); |
256 } | 255 } |
257 | 256 |
258 bool CloudPrintProxyBackend::Core::CurrentlyOnFrontendThread() const { | 257 bool CloudPrintProxyBackend::Core::CurrentlyOnFrontendThread() const { |
259 return base::MessageLoop::current() == backend_->frontend_loop_; | 258 return backend_->frontend_task_runner_->BelongsToCurrentThread(); |
260 } | 259 } |
261 | 260 |
262 bool CloudPrintProxyBackend::Core::CurrentlyOnCoreThread() const { | 261 bool CloudPrintProxyBackend::Core::CurrentlyOnCoreThread() const { |
263 return base::MessageLoop::current() == backend_->core_thread_.message_loop(); | 262 return backend_->core_thread_.task_runner()->BelongsToCurrentThread(); |
264 } | 263 } |
265 | 264 |
266 void CloudPrintProxyBackend::Core::CreateAuthAndConnector() { | 265 void CloudPrintProxyBackend::Core::CreateAuthAndConnector() { |
267 if (!auth_.get()) { | 266 if (!auth_.get()) { |
268 auth_ = new CloudPrintAuth(this, settings_.server_url(), oauth_client_info_, | 267 auth_ = new CloudPrintAuth(this, settings_.server_url(), oauth_client_info_, |
269 settings_.proxy_id()); | 268 settings_.proxy_id()); |
270 } | 269 } |
271 | 270 |
272 if (!connector_.get()) { | 271 if (!connector_.get()) { |
273 connector_ = new CloudPrintConnector(this, settings_); | 272 connector_ = new CloudPrintConnector(this, settings_); |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 HandlePrinterNotification(notification.data); | 578 HandlePrinterNotification(notification.data); |
580 } | 579 } |
581 | 580 |
582 void CloudPrintProxyBackend::Core::OnPingResponse() { | 581 void CloudPrintProxyBackend::Core::OnPingResponse() { |
583 UMA_HISTOGRAM_COUNTS_100("CloudPrint.XmppPingTry", pending_xmpp_pings_); | 582 UMA_HISTOGRAM_COUNTS_100("CloudPrint.XmppPingTry", pending_xmpp_pings_); |
584 pending_xmpp_pings_ = 0; | 583 pending_xmpp_pings_ = 0; |
585 VLOG(1) << "CP_CONNECTOR: Ping response received."; | 584 VLOG(1) << "CP_CONNECTOR: Ping response received."; |
586 } | 585 } |
587 | 586 |
588 } // namespace cloud_print | 587 } // namespace cloud_print |
OLD | NEW |