Protocol / client plugin changes to support interactively asking for a PIN

remoting/client/plugin/chromoting_instance.h

 // Copyright (c) 2012 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.
 
 // TODO(ajwong): We need to come up with a better description of the
 // responsibilities for each thread.
 
 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 #define REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_
 
@@ skipping 21 matching lines @@
 #include "remoting/client/key_event_mapper.h"
 #include "remoting/client/plugin/mac_key_event_processor.h"
 #include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_plugin_thread_delegate.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/cursor_shape_stub.h"
 #include "remoting/protocol/input_event_tracker.h"
 #include "remoting/protocol/mouse_input_filter.h"
+#include "remoting/protocol/negotiating_authenticator.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace pp {
 class InputEvent;
 class Module;
 }  // namespace pp
 
@@ skipping 74 matching lines @@
   void Disconnect();
   void OnIncomingIq(const std::string& iq);
   void ReleaseAllKeys();
   void InjectKeyEvent(const protocol::KeyEvent& event);
   void RemapKey(uint32 in_usb_keycode, uint32 out_usb_keycode);
   void TrapKey(uint32 usb_keycode, bool trap);
   void SendClipboardItem(const std::string& mime_type, const std::string& item);
   void NotifyClientResolution(int width, int height, int x_dpi, int y_dpi);
   void PauseVideo(bool pause);
   void PauseAudio(bool pause);
+  void FetchSecretFromDialog(

[Sergey Ulanov, 2013/03/20 05:49:05]

this and the following method do not need to be public.

[rmsousa, 2013/03/20 20:17:16]

Actually none of the methods in this block do - they're all called from this
class's own message processing.

Regardless of that, FetchSecretFrom* still don't belong in this group, so I
moved them.

+      const protocol::SecretFetchedCallback& secret_fetched_callback);
+  static void FetchSecretFromString(

[Sergey Ulanov, 2013/03/20 05:49:05]

nit: static methods should be declared above non-static ones.

[rmsousa, 2013/03/20 20:17:16]

Done.

+      const std::string& shared_secret,
+      const protocol::SecretFetchedCallback& secret_fetched_callback);
+  void OnPinFetched(const std::string& pin);

[rmsousa, 2013/03/20 04:54:54]

OnPinFetched and use_async_pin_dialog_ below are specifically related to the PIN
dialog (and not any secret), so I kept the PIN nomenclature.

[Sergey Ulanov, 2013/03/20 05:49:05]

sgtm

[rmsousa, 2013/03/20 20:17:16]

Done.

 
   // Return statistics record by ChromotingClient.
   // If no connection is currently active then NULL will be returned.
   ChromotingStats* GetStats();
 
   // Registers a global log message handler that redirects the log output to
   // our plugin instance.
   // This is called by the plugin's PPP_InitializeModule.
   // Note that no logging will be processed unless a ChromotingInstance has been
   // registered for logging (see RegisterLoggingInstance).
@@ skipping 57 matching lines @@
 #endif
   KeyEventMapper key_mapper_;
   PepperInputHandler input_handler_;
 
   // XmppProxy is a refcounted interface used to perform thread-switching and
   // detaching between objects whose lifetimes are controlled by pepper, and
   // jingle_glue objects. This is used when if we start a sandboxed jingle
   // connection.
   scoped_refptr<PepperXmppProxy> xmpp_proxy_;
 
+  // PIN Fetcher.
+  bool use_async_pin_dialog_;
+  protocol::SecretFetchedCallback secret_fetched_callback_;
+
   base::WeakPtrFactory<ChromotingInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingInstance);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_INSTANCE_H_