| 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 "net/cert/cert_database.h" | 5 #include "net/cert/cert_database.h" |
| 6 | 6 |
| 7 #include <Security/Security.h> | 7 #include <Security/Security.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/mac_logging.h" | 10 #include "base/mac/mac_logging.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 public: | 25 public: |
| 26 // Creates a new Notifier that will forward Keychain events to |cert_db|. | 26 // Creates a new Notifier that will forward Keychain events to |cert_db|. |
| 27 // |message_loop| must refer to a thread with an associated CFRunLoop - a | 27 // |message_loop| must refer to a thread with an associated CFRunLoop - a |
| 28 // TYPE_UI thread. Events will be dispatched from this message loop. | 28 // TYPE_UI thread. Events will be dispatched from this message loop. |
| 29 Notifier(CertDatabase* cert_db, base::MessageLoop* message_loop) | 29 Notifier(CertDatabase* cert_db, base::MessageLoop* message_loop) |
| 30 : cert_db_(cert_db), | 30 : cert_db_(cert_db), |
| 31 registered_(false), | 31 registered_(false), |
| 32 called_shutdown_(false) { | 32 called_shutdown_(false) { |
| 33 // Ensure an associated CFRunLoop. | 33 // Ensure an associated CFRunLoop. |
| 34 DCHECK(base::MessageLoopForUI::IsCurrent()); | 34 DCHECK(base::MessageLoopForUI::IsCurrent()); |
| 35 task_runner_ = message_loop->message_loop_proxy(); | 35 task_runner_ = message_loop->task_runner(); |
| 36 task_runner_->PostTask(FROM_HERE, | 36 task_runner_->PostTask(FROM_HERE, |
| 37 base::Bind(&Notifier::Init, | 37 base::Bind(&Notifier::Init, |
| 38 base::Unretained(this))); | 38 base::Unretained(this))); |
| 39 } | 39 } |
| 40 | 40 |
| 41 // Should be called from the |task_runner_|'s thread. Use Shutdown() | 41 // Should be called from the |task_runner_|'s thread. Use Shutdown() |
| 42 // to shutdown on arbitrary threads. | 42 // to shutdown on arbitrary threads. |
| 43 ~Notifier() { | 43 ~Notifier() { |
| 44 DCHECK(called_shutdown_); | 44 DCHECK(called_shutdown_); |
| 45 // Only unregister from the same thread where registration was performed. | 45 // Only unregister from the same thread where registration was performed. |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 case errSecDuplicateItem: | 163 case errSecDuplicateItem: |
| 164 return OK; | 164 return OK; |
| 165 default: | 165 default: |
| 166 OSSTATUS_LOG(ERROR, err) << "CertDatabase failed to add cert to keychain"; | 166 OSSTATUS_LOG(ERROR, err) << "CertDatabase failed to add cert to keychain"; |
| 167 // TODO(snej): Map the error code more intelligently. | 167 // TODO(snej): Map the error code more intelligently. |
| 168 return ERR_ADD_USER_CERT_FAILED; | 168 return ERR_ADD_USER_CERT_FAILED; |
| 169 } | 169 } |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace net | 172 } // namespace net |
| OLD | NEW |