| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_LOGGING_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_LOGGING_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_DRIVE_LOGGING_H_ | 6 #define CHROME_BROWSER_CHROMEOS_DRIVE_LOGGING_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "chrome/browser/drive/event_logger.h" | 11 #include "chrome/browser/drive/event_logger.h" |
| 12 | 12 |
| 13 namespace drive { | 13 namespace drive { |
| 14 // Originally wanted to use 'logging' here, but it conflicts with | 14 // Originally wanted to use 'logging' here, but it conflicts with |
| 15 // base/logging.h, and breaks DCHECK() and friends. | 15 // base/logging.h, and breaks DCHECK() and friends. |
| 16 namespace util { | 16 namespace util { |
| 17 | 17 |
| 18 // Logs a message using printf format. | 18 // Logs a message using printf format. |
| 19 // This function can be called from any thread. | 19 // This function can be called from any thread. |
| 20 void Log(const char* format, ...) PRINTF_FORMAT(1, 2); | 20 void Log( |
| 21 logging::LogSeverity severity, const char* format, ...) PRINTF_FORMAT(2, 3); |
| 21 | 22 |
| 22 // Returns the log history. | 23 // Returns the log history. |
| 23 // This function can be called from any thread. | 24 // This function can be called from any thread. |
| 24 std::vector<EventLogger::Event> GetLogHistory(); | 25 std::vector<EventLogger::Event> GetLogHistory(); |
| 25 | 26 |
| 26 } // namespace util | 27 } // namespace util |
| 27 } // namespace drive | 28 } // namespace drive |
| 28 | 29 |
| 29 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_LOGGING_H_ | 30 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_LOGGING_H_ |
| OLD | NEW |