Chromium Code Reviews| Index: components/copresence/public/copresence_client_delegate.h |
| diff --git a/components/copresence/public/copresence_client_delegate.h b/components/copresence/public/copresence_client_delegate.h |
| index 374eb96561a7f40c8fcec20477c08ba4c8ecf2a3..82b31eae047887253651fb39021db1b80ab967ee 100644 |
| --- a/components/copresence/public/copresence_client_delegate.h |
| +++ b/components/copresence/public/copresence_client_delegate.h |
| @@ -1,14 +1,14 @@ |
| // Copyright 2014 The Chromium Authors. All rights reserved. |
| -// Use of this source code is governed by a BSD-style license that can be |
| -// found in the LICENSE file. |
| +// Use of this source code is governed by a BSD-style license |
| +// that can be found in the LICENSE file. |
| -#ifndef COMPONENTS_COPRESENCE_PUBLIC_COPRESENCE_DELEGATE_H_ |
| -#define COMPONENTS_COPRESENCE_PUBLIC_COPRESENCE_DELEGATE_H_ |
| +#ifndef COMPONENTS_COPRESENCE_PUBLIC_COPRESENCE_CLIENT_DELEGATE_H_ |
| +#define COMPONENTS_COPRESENCE_PUBLIC_COPRESENCE_CLIENT_DELEGATE_H_ |
| #include <string> |
| +#include <vector> |
| #include "base/callback_forward.h" |
| -#include "components/copresence/proto/rpcs.pb.h" |
| namespace net { |
| class URLRequestContextGetter; |
| @@ -16,9 +16,10 @@ class URLRequestContextGetter; |
| namespace copresence { |
| +class Message; |
| class WhispernetClient; |
| -enum CopresenceStatus { SUCCESS, FAIL }; |
| +enum CopresenceStatus { SUCCESS, FAIL, NONE }; |
|
Daniel Erat
2014/08/06 21:35:18
i think that you're just using NONE for testing, r
Charlie
2014/08/06 22:36:23
Seems to make the tests clunkier, but ok.
|
| // Callback type to send a status. |
| typedef base::Callback<void(CopresenceStatus)> StatusCallback; |
| @@ -31,7 +32,7 @@ class CopresenceClientDelegate { |
| virtual void HandleMessages( |
| const std::string& app_id, |
| const std::string& subscription_id, |
| - const std::vector<copresence::Message>& message) = 0; |
| + const std::vector<Message>& message) = 0; |
| virtual net::URLRequestContextGetter* GetRequestContext() const = 0; |
| @@ -48,4 +49,4 @@ class CopresenceClientDelegate { |
| } // namespace copresence |
| -#endif // COMPONENTS_COPRESENCE_PUBLIC_COPRESENCE_DELEGATE_H_ |
| +#endif // COMPONENTS_COPRESENCE_PUBLIC_COPRESENCE_CLIENT_DELEGATE_H_ |