| Index: chrome/browser/android/tab_android.h
|
| diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
|
| index e2d707fabb14410d09f67eb9d401b8a8ab7c45b3..2a2c542eb927a6cd9be723f846c2d5c49cfadf36 100644
|
| --- a/chrome/browser/android/tab_android.h
|
| +++ b/chrome/browser/android/tab_android.h
|
| @@ -49,6 +49,7 @@ class TabAndroid : public CoreTabHelperDelegate,
|
| static TabAndroid* GetNativeTab(JNIEnv* env, jobject obj);
|
|
|
| TabAndroid(JNIEnv* env, jobject obj);
|
| + virtual ~TabAndroid();
|
|
|
| // Return the WebContents, if any, currently owned by this TabAndroid.
|
| content::WebContents* web_contents() const { return web_contents_.get(); }
|
| @@ -75,30 +76,33 @@ class TabAndroid : public CoreTabHelperDelegate,
|
|
|
| void SetSyncId(int sync_id);
|
|
|
| - virtual void HandlePopupNavigation(chrome::NavigateParams* params) = 0;
|
| + virtual void HandlePopupNavigation(chrome::NavigateParams* params);
|
|
|
| virtual void OnReceivedHttpAuthRequest(jobject auth_handler,
|
| const base::string16& host,
|
| - const base::string16& realm) = 0;
|
| + const base::string16& realm);
|
|
|
| // Called when context menu option to create the bookmark shortcut on
|
| // homescreen is called.
|
| - virtual void AddShortcutToBookmark(
|
| - const GURL& url, const base::string16& title, const SkBitmap& skbitmap,
|
| - int r_value, int g_value, int b_value) = 0;
|
| + virtual void AddShortcutToBookmark(const GURL& url,
|
| + const base::string16& title,
|
| + const SkBitmap& skbitmap,
|
| + int r_value,
|
| + int g_value,
|
| + int b_value);
|
|
|
| // Called when a bookmark node should be edited.
|
| virtual void EditBookmark(int64 node_id,
|
| const base::string16& node_title,
|
| bool is_folder,
|
| - bool is_partner_bookmark) = 0;
|
| + bool is_partner_bookmark);
|
| +
|
| + // Called to notify that the new tab page has completely rendered.
|
| + virtual void OnNewTabPageReady();
|
|
|
| // Called to determine if chrome://welcome should contain links to the terms
|
| // of service and the privacy notice.
|
| - virtual bool ShouldWelcomePageLinkToTermsOfService() = 0;
|
| -
|
| - // Called to notify that the new tab page has completely rendered.
|
| - virtual void OnNewTabPageReady() = 0;
|
| + virtual bool ShouldWelcomePageLinkToTermsOfService();
|
|
|
| static void InitTabHelpers(content::WebContents* web_contents);
|
|
|
| @@ -117,13 +121,13 @@ class TabAndroid : public CoreTabHelperDelegate,
|
|
|
| // Methods called from Java via JNI -----------------------------------------
|
|
|
| + virtual void Destroy(JNIEnv* env, jobject obj);
|
| virtual void InitWebContents(JNIEnv* env,
|
| jobject obj,
|
| jboolean incognito,
|
| jobject jcontent_view_core,
|
| jobject jweb_contents_delegate,
|
| jobject jcontext_menu_populator);
|
| -
|
| virtual void DestroyWebContents(JNIEnv* env,
|
| jobject obj,
|
| jboolean delete_native);
|
| @@ -136,9 +140,6 @@ class TabAndroid : public CoreTabHelperDelegate,
|
| jstring jtitle);
|
| bool Print(JNIEnv* env, jobject obj);
|
|
|
| - protected:
|
| - virtual ~TabAndroid();
|
| -
|
| private:
|
| JavaObjectWeakGlobalRef weak_java_tab_;
|
|
|
|
|