Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: chrome/browser/android/tab_android.h

Issue 144443003: Unify desktop and Android tab helper instantiation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing WindowAndroidHelper Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_helper.h" 10 #include "base/android/jni_helper.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 bool is_folder, 97 bool is_folder,
98 bool is_partner_bookmark); 98 bool is_partner_bookmark);
99 99
100 // Called to notify that the new tab page has completely rendered. 100 // Called to notify that the new tab page has completely rendered.
101 virtual void OnNewTabPageReady(); 101 virtual void OnNewTabPageReady();
102 102
103 // Called to determine if chrome://welcome should contain links to the terms 103 // Called to determine if chrome://welcome should contain links to the terms
104 // of service and the privacy notice. 104 // of service and the privacy notice.
105 virtual bool ShouldWelcomePageLinkToTermsOfService(); 105 virtual bool ShouldWelcomePageLinkToTermsOfService();
106 106
107 static void InitTabHelpers(content::WebContents* web_contents);
108
109 // Register the Tab's native methods through JNI. 107 // Register the Tab's native methods through JNI.
110 static bool RegisterTabAndroid(JNIEnv* env); 108 static bool RegisterTabAndroid(JNIEnv* env);
111 109
112 // CoreTabHelperDelegate ---------------------------------------------------- 110 // CoreTabHelperDelegate ----------------------------------------------------
113 111
114 virtual void SwapTabContents(content::WebContents* old_contents, 112 virtual void SwapTabContents(content::WebContents* old_contents,
115 content::WebContents* new_contents) OVERRIDE; 113 content::WebContents* new_contents) OVERRIDE;
116 114
117 // NotificationObserver ----------------------------------------------------- 115 // NotificationObserver -----------------------------------------------------
118 virtual void Observe(int type, 116 virtual void Observe(int type,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 scoped_ptr<content::WebContents> web_contents_; 150 scoped_ptr<content::WebContents> web_contents_;
153 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 151 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
154 web_contents_delegate_; 152 web_contents_delegate_;
155 153
156 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 154 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
157 155
158 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 156 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
159 }; 157 };
160 158
161 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 159 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_web_contents_delegate_android.cc ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698