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

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

Issue 15499005: Add a new SyncedTabDelegate for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add additional constructor. Created 7 years, 7 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 #include "chrome/browser/android/tab_android.h" 5 #include "chrome/browser/android/tab_android.h"
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 8 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
9 #include "chrome/browser/extensions/tab_helper.h" 9 #include "chrome/browser/extensions/tab_helper.h"
10 #include "chrome/browser/favicon/favicon_tab_helper.h" 10 #include "chrome/browser/favicon/favicon_tab_helper.h"
11 #include "chrome/browser/history/history_tab_helper.h" 11 #include "chrome/browser/history/history_tab_helper.h"
12 #include "chrome/browser/infobars/infobar_service.h" 12 #include "chrome/browser/infobars/infobar_service.h"
13 #include "chrome/browser/password_manager/password_manager.h" 13 #include "chrome/browser/password_manager/password_manager.h"
14 #include "chrome/browser/password_manager/password_manager_delegate_impl.h" 14 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"
15 #include "chrome/browser/prerender/prerender_tab_helper.h" 15 #include "chrome/browser/prerender/prerender_tab_helper.h"
16 #include "chrome/browser/sessions/session_tab_helper.h" 16 #include "chrome/browser/sessions/session_tab_helper.h"
17 #include "chrome/browser/ssl/ssl_tab_helper.h" 17 #include "chrome/browser/ssl/ssl_tab_helper.h"
18 #include "chrome/browser/translate/translate_tab_helper.h" 18 #include "chrome/browser/translate/translate_tab_helper.h"
19 #include "chrome/browser/ui/alternate_error_tab_observer.h" 19 #include "chrome/browser/ui/alternate_error_tab_observer.h"
20 #include "chrome/browser/ui/android/window_android_helper.h" 20 #include "chrome/browser/ui/android/window_android_helper.h"
21 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h" 21 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
22 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" 22 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
23 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" 23 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
24 #include "chrome/browser/ui/browser_tab_contents.h" 24 #include "chrome/browser/ui/browser_tab_contents.h"
25 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 25 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
26 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 26 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
27 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
28 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 27 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
29 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" 28 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
30 #include "components/autofill/browser/autofill_external_delegate.h" 29 #include "components/autofill/browser/autofill_external_delegate.h"
31 #include "components/autofill/browser/autofill_manager.h" 30 #include "components/autofill/browser/autofill_manager.h"
32 #include "content/public/browser/android/content_view_core.h" 31 #include "content/public/browser/android/content_view_core.h"
33 #include "content/public/browser/web_contents.h" 32 #include "content/public/browser/web_contents.h"
34 #include "extensions/browser/view_type_utils.h" 33 #include "extensions/browser/view_type_utils.h"
35 #include "jni/TabBase_jni.h" 34 #include "jni/TabBase_jni.h"
36 35
37 using content::WebContents; 36 using content::WebContents;
(...skipping 12 matching lines...) Expand all
50 if (initialization_tag) 49 if (initialization_tag)
51 return; 50 return;
52 51
53 // Mark as initialized. 52 // Mark as initialized.
54 contents->SetUserData(&kTabHelpersInitializedUserDataKey, 53 contents->SetUserData(&kTabHelpersInitializedUserDataKey,
55 new base::SupportsUserData::Data()); 54 new base::SupportsUserData::Data());
56 55
57 // Set the view type. 56 // Set the view type.
58 extensions::SetViewType(contents, extensions::VIEW_TYPE_TAB_CONTENTS); 57 extensions::SetViewType(contents, extensions::VIEW_TYPE_TAB_CONTENTS);
59 58
60 // SessionTabHelper comes first because it sets up the tab ID, and other
61 // helpers may rely on that.
62 SessionTabHelper::CreateForWebContents(contents);
63
64 AlternateErrorPageTabObserver::CreateForWebContents(contents); 59 AlternateErrorPageTabObserver::CreateForWebContents(contents);
65 autofill::TabAutofillManagerDelegate::CreateForWebContents(contents); 60 autofill::TabAutofillManagerDelegate::CreateForWebContents(contents);
66 autofill::AutofillManager::CreateForWebContentsAndDelegate( 61 autofill::AutofillManager::CreateForWebContentsAndDelegate(
67 contents, 62 contents,
68 autofill::TabAutofillManagerDelegate::FromWebContents(contents), 63 autofill::TabAutofillManagerDelegate::FromWebContents(contents),
69 g_browser_process->GetApplicationLocale(), 64 g_browser_process->GetApplicationLocale(),
70 autofill::AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER); 65 autofill::AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
71 autofill::AutofillExternalDelegate::CreateForWebContentsAndManager( 66 autofill::AutofillExternalDelegate::CreateForWebContentsAndManager(
72 contents, autofill::AutofillManager::FromWebContents(contents)); 67 contents, autofill::AutofillManager::FromWebContents(contents));
73 autofill::AutofillManager::FromWebContents(contents)->SetExternalDelegate( 68 autofill::AutofillManager::FromWebContents(contents)->SetExternalDelegate(
74 autofill::AutofillExternalDelegate::FromWebContents(contents)); 69 autofill::AutofillExternalDelegate::FromWebContents(contents));
75 BlockedContentTabHelper::CreateForWebContents(contents); 70 BlockedContentTabHelper::CreateForWebContents(contents);
76 BookmarkTabHelper::CreateForWebContents(contents); 71 BookmarkTabHelper::CreateForWebContents(contents);
77 CoreTabHelper::CreateForWebContents(contents); 72 CoreTabHelper::CreateForWebContents(contents);
78 extensions::TabHelper::CreateForWebContents(contents); 73 extensions::TabHelper::CreateForWebContents(contents);
79 FaviconTabHelper::CreateForWebContents(contents); 74 FaviconTabHelper::CreateForWebContents(contents);
80 FindTabHelper::CreateForWebContents(contents); 75 FindTabHelper::CreateForWebContents(contents);
81 HistoryTabHelper::CreateForWebContents(contents); 76 HistoryTabHelper::CreateForWebContents(contents);
82 InfoBarService::CreateForWebContents(contents); 77 InfoBarService::CreateForWebContents(contents);
83 PasswordManagerDelegateImpl::CreateForWebContents(contents); 78 PasswordManagerDelegateImpl::CreateForWebContents(contents);
84 PasswordManager::CreateForWebContentsAndDelegate( 79 PasswordManager::CreateForWebContentsAndDelegate(
85 contents, PasswordManagerDelegateImpl::FromWebContents(contents)); 80 contents, PasswordManagerDelegateImpl::FromWebContents(contents));
86 PrefsTabHelper::CreateForWebContents(contents); 81 PrefsTabHelper::CreateForWebContents(contents);
87 prerender::PrerenderTabHelper::CreateForWebContents(contents); 82 prerender::PrerenderTabHelper::CreateForWebContents(contents);
88 SSLTabHelper::CreateForWebContents(contents); 83 SSLTabHelper::CreateForWebContents(contents);
89 TabContentsSyncedTabDelegate::CreateForWebContents(contents);
90 TabSpecificContentSettings::CreateForWebContents(contents); 84 TabSpecificContentSettings::CreateForWebContents(contents);
91 TranslateTabHelper::CreateForWebContents(contents); 85 TranslateTabHelper::CreateForWebContents(contents);
92 WindowAndroidHelper::CreateForWebContents(contents); 86 WindowAndroidHelper::CreateForWebContents(contents);
93 } 87 }
94 88
95 void TabAndroid::InitTabHelpers(WebContents* contents) { 89 void TabAndroid::InitTabHelpers(WebContents* contents) {
96 BrowserTabContents::AttachTabHelpers(contents); 90 BrowserTabContents::AttachTabHelpers(contents);
97 } 91 }
98 92
99 WebContents* TabAndroid::InitWebContentsFromView(JNIEnv* env, 93 WebContents* TabAndroid::InitWebContentsFromView(JNIEnv* env,
100 jobject content_view) { 94 jobject content_view) {
101 content::ContentViewCore* content_view_core = 95 content::ContentViewCore* content_view_core =
102 content::ContentViewCore::GetNativeContentViewCore(env, content_view); 96 content::ContentViewCore::GetNativeContentViewCore(env, content_view);
103 DCHECK(content_view_core); 97 DCHECK(content_view_core);
104 WebContents* web_contents = content_view_core->GetWebContents(); 98 WebContents* web_contents = content_view_core->GetWebContents();
105 DCHECK(web_contents); 99 DCHECK(web_contents);
100 // SessionTabHelper comes first because it sets up the tab ID, and other
101 // helpers may rely on that.
102 SessionTabHelper::CreateForWebContentsWithId(web_contents, tab_id_);
106 InitTabHelpers(web_contents); 103 InitTabHelpers(web_contents);
107 return web_contents; 104 return web_contents;
108 } 105 }
109 106
110 TabAndroid::TabAndroid(JNIEnv* env, jobject obj) 107 TabAndroid::TabAndroid(JNIEnv* env, jobject obj) : weak_java_tab_(env, obj) {
111 : tab_id_(-1),
112 weak_java_tab_(env, obj) {
113 Java_TabBase_setNativePtr(env, obj, reinterpret_cast<jint>(this)); 108 Java_TabBase_setNativePtr(env, obj, reinterpret_cast<jint>(this));
114 } 109 }
115 110
116 TabAndroid::~TabAndroid() { 111 TabAndroid::~TabAndroid() {
117 JNIEnv* env = base::android::AttachCurrentThread(); 112 JNIEnv* env = base::android::AttachCurrentThread();
118 ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env); 113 ScopedJavaLocalRef<jobject> obj = weak_java_tab_.get(env);
119 if (obj.is_null()) 114 if (obj.is_null())
120 return; 115 return;
121 116
122 Java_TabBase_destroyBase(env, obj.obj()); 117 Java_TabBase_destroyBase(env, obj.obj());
123 } 118 }
124 119
125 content::WebContents* TabAndroid::GetWebContents() { 120 content::WebContents* TabAndroid::GetWebContents() {
126 return NULL; 121 return NULL;
127 } 122 }
128 123
129 ToolbarModel::SecurityLevel TabAndroid::GetSecurityLevel() { 124 ToolbarModel::SecurityLevel TabAndroid::GetSecurityLevel() {
130 return ToolbarModelImpl::GetSecurityLevelForWebContents(GetWebContents()); 125 return ToolbarModelImpl::GetSecurityLevelForWebContents(GetWebContents());
131 } 126 }
132 127
133 void TabAndroid::RunExternalProtocolDialog(const GURL& url) { 128 void TabAndroid::RunExternalProtocolDialog(const GURL& url) {
134 } 129 }
135 130
136 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { 131 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
137 return RegisterNativesImpl(env); 132 return RegisterNativesImpl(env);
138 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698