Refactor ContentShell to remove ContentViewClient dependency.

content/shell/shell.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.
 
 #ifndef CONTENT_SHELL_SHELL_H_
 #define CONTENT_SHELL_SHELL_H_
 
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ipc/ipc_channel.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #include "ui/base/gtk/gtk_signal.h"
 
 typedef struct _GtkToolItem GtkToolItem;
 #elif defined(OS_ANDROID)
-#include "content/shell/android/shell_view.h"
+#include "base/android/scoped_java_ref.h"
 #endif
 
 class GURL;
 class WebContents;
 
 namespace content {
 
 class BrowserContext;
 class ShellJavaScriptDialogCreator;
 class SiteInstance;
@@ skipping 32 matching lines @@
 
   // Closes all windows and exits.
   static void PlatformExit();
 
   WebContents* web_contents() const { return web_contents_.get(); }
 
 #if defined(OS_MACOSX)
   // Public to be called by an ObjC bridge object.
   void ActionPerformed(int control);
   void URLEntered(std::string url_string);
+#elif defined(OS_ANDROID)
+  // Registers the Android Java to native methods.
+  static bool Register(JNIEnv* env);
 #endif
 
  private:
   enum UIControl {
     BACK_BUTTON,
     FORWARD_BUTTON,
     STOP_BUTTON
   };
 
   explicit Shell(WebContents* web_contents);
@@ skipping 22 matching lines @@
 
 #if (defined(OS_WIN) && !defined(USE_AURA)) || defined(TOOLKIT_GTK)
   // Resizes the main window to the given dimensions.
   void SizeTo(int width, int height);
 #endif
 
   gfx::NativeView GetContentView();
 
   // content::WebContentsDelegate
   virtual void LoadingStateChanged(WebContents* source) OVERRIDE;
+#if defined(OS_ANDROID)
+  virtual void LoadProgressChanged(double progress) OVERRIDE;
+#endif
   virtual void WebContentsCreated(WebContents* source_contents,
                                   int64 source_frame_id,
                                   const GURL& target_url,
                                   WebContents* new_contents) OVERRIDE;
   virtual void DidNavigateMainFramePostCommit(
       WebContents* web_contents) OVERRIDE;
   virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE;
 #if defined(OS_MACOSX)
   virtual void HandleKeyboardEvent(
       const NativeWebKeyboardEvent& event) OVERRIDE;
@@ skipping 47 matching lines @@
   GtkToolItem* forward_button_;
   GtkToolItem* reload_button_;
   GtkToolItem* stop_button_;
 
   GtkWidget* spinner_;
   GtkToolItem* spinner_item_;
 
   int content_width_;
   int content_height_;
 #elif defined(OS_ANDROID)
-  scoped_ptr<ShellView> shell_view_;
+  base::android::ScopedJavaGlobalRef<jobject> java_object_;
 #endif
 
   // A container of all the open windows. We use a vector so we can keep track
   // of ordering.
   static std::vector<Shell*> windows_;
 
   // True if the destructur of Shell should post a quit closure on the current
   // message loop if the destructed Shell object was the last one.
   static bool quit_message_loop_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_SHELL_H_