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_driver.h" | 5 #include "components/gcm_driver/gcm_driver.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/location.h" | 12 #include "base/location.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/sequenced_task_runner.h" | 14 #include "base/sequenced_task_runner.h" |
15 #include "base/threading/sequenced_worker_pool.h" | 15 #include "base/threading/sequenced_worker_pool.h" |
16 #include "chrome/common/chrome_version_info.h" | |
17 #include "components/gcm_driver/gcm_app_handler.h" | 16 #include "components/gcm_driver/gcm_app_handler.h" |
18 #include "components/gcm_driver/gcm_client_factory.h" | 17 #include "components/gcm_driver/gcm_client_factory.h" |
19 #include "components/gcm_driver/system_encryptor.h" | 18 #include "components/gcm_driver/system_encryptor.h" |
20 #include "google_apis/gaia/oauth2_token_service.h" | 19 #include "google_apis/gaia/oauth2_token_service.h" |
21 #include "net/url_request/url_request_context_getter.h" | 20 #include "net/url_request/url_request_context_getter.h" |
22 | 21 |
23 namespace gcm { | 22 namespace gcm { |
24 | 23 |
25 // Helper class to save tasks to run until we're ready to execute them. | 24 // Helper class to save tasks to run until we're ready to execute them. |
26 class GCMDriver::DelayedTaskController { | 25 class GCMDriver::DelayedTaskController { |
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
812 LOG(WARNING) << "request_gcm_statistics_callback_ is NULL."; | 811 LOG(WARNING) << "request_gcm_statistics_callback_ is NULL."; |
813 } | 812 } |
814 | 813 |
815 std::string GCMDriver::SignedInUserName() const { | 814 std::string GCMDriver::SignedInUserName() const { |
816 if (IsStarted()) | 815 if (IsStarted()) |
817 return identity_provider_->GetActiveUsername(); | 816 return identity_provider_->GetActiveUsername(); |
818 return std::string(); | 817 return std::string(); |
819 } | 818 } |
820 | 819 |
821 } // namespace gcm | 820 } // namespace gcm |
OLD | NEW |