Tied up BlimpNavigationController to NavigationFeature

blimp/client/core/blimp_navigation_controller_impl.h

Index: blimp/client/core/blimp_navigation_controller_impl.h
diff --git a/blimp/client/core/blimp_navigation_controller_impl.h b/blimp/client/core/blimp_navigation_controller_impl.h
index 90c42e06e88d18bacb2c8b5e7c42dc8efabe9a81..055d4987d830b5b57bf76f6b33b9b1588a011e7e 100644
--- a/blimp/client/core/blimp_navigation_controller_impl.h
+++ b/blimp/client/core/blimp_navigation_controller_impl.h
@@ -7,9 +7,12 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "blimp/client/feature/navigation_feature.h"
 #include "blimp/client/public/blimp_navigation_controller.h"
 #include "url/gurl.h"
 
+class SkBitmap;
+
 namespace blimp {
 namespace client {
 
@@ -21,18 +24,39 @@ class BlimpNavigationControllerDelegate;
 // The BlimpNavigationControllerImpl is the implementation part of
 // BlimpNavigationController. It maintains the back-forward list for a
 // BlimpContentsImpl and manages all navigation within that list.
-class BlimpNavigationControllerImpl : public BlimpNavigationController {
+class BlimpNavigationControllerImpl
+    : public BlimpNavigationController,
+      public NavigationFeature::NavigationFeatureDelegate {
  public:
+  // TODO(shaktisahu): Provide NavigationFeature* in the constructor.
   explicit BlimpNavigationControllerImpl(

[David Trainor- moved to gerrit, 2016/07/25 15:57:31]

Why can't we pass one in now?  Can we just pass nullptr from the current
callsite if it's not ready yet?

[nyquist, 2016/07/25 22:59:06]

The feature doesn't live in //blimp/client/core yet, but I think this CL could
move it to //blimp/client/core/contents.

[shaktisahu, 2016/07/26 01:25:27]

Done. Passing a nullptr now at the call site (BlimpContentsImpl constructor)

       BlimpNavigationControllerDelegate* delegate);
   ~BlimpNavigationControllerImpl() override;
 
   // BlimpNavigationController implementation.
   void LoadURL(const GURL& url) override;
+  void Reload() override;
+  bool CanGoBack() const override;
+  bool CanGoForward() const override;
+  void GoBack() override;
+  void GoForward() override;
+
   const GURL& GetURL() override;
 
+  // For testing only.
+  void SetNavigationFeatureForTesting(NavigationFeature* feature);
+
  private:
-  void NotifyDelegateURLLoaded(const GURL& url);
+  // NavigationFeatureDelegate implementation.
+  void OnUrlChanged(int tab_id, const GURL& url) override;
+  void OnFaviconChanged(int tab_id, const SkBitmap& favicon) override;
+  void OnTitleChanged(int tab_id, const std::string& title) override;
+  void OnLoadingChanged(int tab_id, bool loading) override;
+  void OnPageLoadStatusUpdate(int tab_id, bool completed) override;
+
+  // The |navigation_feature_| is responsible for sending and receiving the
+  // navigation state to the server over the proto channel.
+  NavigationFeature* navigation_feature_;
 
   // The delegate contains functionality required for the navigation controller
   // to function correctly. It is also invoked on relevant state changes of the
@@ -42,9 +66,6 @@ class BlimpNavigationControllerImpl : public BlimpNavigationController {
   // The currently active URL.
   GURL current_url_;
 
-  // TODO(shaktisahu): Remove this after integration with NavigationFeature.
-  base::WeakPtrFactory<BlimpNavigationControllerImpl> weak_ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(BlimpNavigationControllerImpl);
 };