Chromium Code Reviews| Index: remoting/client/plugin/chromoting_instance.h |
| diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h |
| index f2844bc245161634446ad34b1742ea106c40b5d1..50c011e67307cd5d11f1b8e28ae9ac8c08096dd8 100644 |
| --- a/remoting/client/plugin/chromoting_instance.h |
| +++ b/remoting/client/plugin/chromoting_instance.h |
| @@ -176,7 +176,8 @@ class ChromotingInstance : |
| // Immediately calls |secret_fetched_callback| with |shared_secret|. |
| static void FetchSecretFromString( |
| const std::string& shared_secret, |
| - const protocol::SecretFetchedCallback& secret_fetched_callback); |
| + const protocol::SecretFetchedCallback& secret_fetched_callback, |
|
rmsousa
2013/05/23 00:14:59
Nit: The convention is to have the callback as the
Jamie
2013/05/23 01:10:08
Done.
|
| + bool pairing_supported); |
| // Message handlers for messages that come from JavaScript. Called |
| // from HandleMessage(). |
| @@ -218,7 +219,8 @@ class ChromotingInstance : |
| // Used as the |FetchSecretCallback| for Me2Me connections. |
| // Uses the PIN request dialog in the webapp to obtain the shared secret. |
| void FetchSecretFromDialog( |
| - const protocol::SecretFetchedCallback& secret_fetched_callback); |
| + const protocol::SecretFetchedCallback& secret_fetched_callback, |
| + bool pairing_supported); |
| bool initialized_; |