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

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

Issue 149393004: Revert of Unify desktop and Android tab helper instantiation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 9 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
10 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
11 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 13 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
14 #include "chrome/browser/extensions/tab_helper.h"
15 #include "chrome/browser/favicon/favicon_tab_helper.h"
16 #include "chrome/browser/history/history_tab_helper.h"
17 #include "chrome/browser/infobars/infobar_service.h"
18 #include "chrome/browser/net/net_error_tab_helper.h"
19 #include "chrome/browser/password_manager/password_manager.h"
20 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"
21 #include "chrome/browser/prerender/prerender_tab_helper.h"
13 #include "chrome/browser/printing/print_view_manager_basic.h" 22 #include "chrome/browser/printing/print_view_manager_basic.h"
14 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/profiles/profile_android.h" 24 #include "chrome/browser/profiles/profile_android.h"
16 #include "chrome/browser/sessions/session_tab_helper.h" 25 #include "chrome/browser/sessions/session_tab_helper.h"
26 #include "chrome/browser/ssl/ssl_tab_helper.h"
17 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h" 27 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
28 #include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
29 #include "chrome/browser/translate/translate_tab_helper.h"
30 #include "chrome/browser/ui/alternate_error_tab_observer.h"
18 #include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_deleg ate.h" 31 #include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_deleg ate.h"
19 #include "chrome/browser/ui/android/context_menu_helper.h" 32 #include "chrome/browser/ui/android/context_menu_helper.h"
20 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 33 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
21 #include "chrome/browser/ui/android/tab_model/tab_model.h" 34 #include "chrome/browser/ui/android/tab_model/tab_model.h"
22 #include "chrome/browser/ui/android/tab_model/tab_model_list.h" 35 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
23 #include "chrome/browser/ui/android/window_android_helper.h" 36 #include "chrome/browser/ui/android/window_android_helper.h"
37 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
24 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" 38 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
39 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
40 #include "chrome/browser/ui/browser_tab_contents.h"
41 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
42 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
25 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 43 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
26 #include "chrome/browser/ui/tab_helpers.h"
27 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" 44 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
45 #include "components/autofill/content/browser/autofill_driver_impl.h"
28 #include "content/public/browser/android/content_view_core.h" 46 #include "content/public/browser/android/content_view_core.h"
29 #include "content/public/browser/navigation_entry.h" 47 #include "content/public/browser/navigation_entry.h"
30 #include "content/public/browser/notification_service.h" 48 #include "content/public/browser/notification_service.h"
31 #include "content/public/browser/web_contents.h" 49 #include "content/public/browser/web_contents.h"
50 #include "extensions/browser/view_type_utils.h"
32 #include "jni/TabBase_jni.h" 51 #include "jni/TabBase_jni.h"
33 52
53 #if defined(ENABLE_MANAGED_USERS)
54 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
55 #endif
56
57 namespace {
58
59 const char kTabHelpersInitializedUserDataKey[] =
60 "TabAndroidTabHelpersInitialized";
61
62 } // namespace
63
64 void BrowserTabContents::AttachTabHelpers(content::WebContents* contents) {
65 // If already initialized, nothing to be done.
66 base::SupportsUserData::Data* initialization_tag =
67 contents->GetUserData(&kTabHelpersInitializedUserDataKey);
68 if (initialization_tag)
69 return;
70
71 // Mark as initialized.
72 contents->SetUserData(&kTabHelpersInitializedUserDataKey,
73 new base::SupportsUserData::Data());
74
75 // Set the view type.
76 extensions::SetViewType(contents, extensions::VIEW_TYPE_TAB_CONTENTS);
77
78 Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
79
80 // SessionTabHelper comes first because it sets up the tab ID, and other
81 // helpers may rely on that.
82 SessionTabHelper::CreateForWebContents(contents);
83
84 AlternateErrorPageTabObserver::CreateForWebContents(contents);
85 autofill::TabAutofillManagerDelegate::CreateForWebContents(contents);
86 autofill::AutofillDriverImpl::CreateForWebContentsAndDelegate(
87 contents,
88 autofill::TabAutofillManagerDelegate::FromWebContents(contents),
89 g_browser_process->GetApplicationLocale(),
90 autofill::AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
91 BookmarkTabHelper::CreateForWebContents(contents);
92 ContextMenuHelper::CreateForWebContents(contents);
93 CoreTabHelper::CreateForWebContents(contents);
94 extensions::TabHelper::CreateForWebContents(contents);
95 FaviconTabHelper::CreateForWebContents(contents);
96 FindTabHelper::CreateForWebContents(contents);
97 HistoryTabHelper::CreateForWebContents(contents);
98 InfoBarService::CreateForWebContents(contents);
99 NavigationMetricsRecorder::CreateForWebContents(contents);
100 chrome_browser_net::NetErrorTabHelper::CreateForWebContents(contents);
101 PasswordManagerDelegateImpl::CreateForWebContents(contents);
102 PasswordManager::CreateForWebContentsAndDelegate(
103 contents, PasswordManagerDelegateImpl::FromWebContents(contents));
104 PopupBlockerTabHelper::CreateForWebContents(contents);
105 PrefsTabHelper::CreateForWebContents(contents);
106 prerender::PrerenderTabHelper::CreateForWebContentsWithPasswordManager(
107 contents, PasswordManager::FromWebContents(contents));
108 SingleTabModeTabHelper::CreateForWebContents(contents);
109 SSLTabHelper::CreateForWebContents(contents);
110 TabSpecificContentSettings::CreateForWebContents(contents);
111 TranslateTabHelper::CreateForWebContents(contents);
112 WindowAndroidHelper::CreateForWebContents(contents);
113
114 #if defined(ENABLE_MANAGED_USERS)
115 if (profile->IsManaged())
116 ManagedModeNavigationObserver::CreateForWebContents(contents);
117 #endif
118 }
119
120 // TODO(dtrainor): Refactor so we do not need this method.
121 void TabAndroid::InitTabHelpers(content::WebContents* contents) {
122 BrowserTabContents::AttachTabHelpers(contents);
123 }
124
34 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) { 125 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
35 CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents); 126 CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
36 if (!core_tab_helper) 127 if (!core_tab_helper)
37 return NULL; 128 return NULL;
38 129
39 CoreTabHelperDelegate* core_delegate = core_tab_helper->delegate(); 130 CoreTabHelperDelegate* core_delegate = core_tab_helper->delegate();
40 if (!core_delegate) 131 if (!core_delegate)
41 return NULL; 132 return NULL;
42 133
43 return static_cast<TabAndroid*>(core_delegate); 134 return static_cast<TabAndroid*>(core_delegate);
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 jobject jcontent_view_core, 324 jobject jcontent_view_core,
234 jobject jweb_contents_delegate, 325 jobject jweb_contents_delegate,
235 jobject jcontext_menu_populator) { 326 jobject jcontext_menu_populator) {
236 content::ContentViewCore* content_view_core = 327 content::ContentViewCore* content_view_core =
237 content::ContentViewCore::GetNativeContentViewCore(env, 328 content::ContentViewCore::GetNativeContentViewCore(env,
238 jcontent_view_core); 329 jcontent_view_core);
239 DCHECK(content_view_core); 330 DCHECK(content_view_core);
240 DCHECK(content_view_core->GetWebContents()); 331 DCHECK(content_view_core->GetWebContents());
241 332
242 web_contents_.reset(content_view_core->GetWebContents()); 333 web_contents_.reset(content_view_core->GetWebContents());
243 TabHelpers::AttachTabHelpers(web_contents_.get()); 334 InitTabHelpers(web_contents_.get());
244 335
245 session_tab_id_.set_id( 336 session_tab_id_.set_id(
246 SessionTabHelper::FromWebContents(web_contents())->session_id().id()); 337 SessionTabHelper::FromWebContents(web_contents())->session_id().id());
247 ContextMenuHelper::FromWebContents(web_contents())->SetPopulator( 338 ContextMenuHelper::FromWebContents(web_contents())->SetPopulator(
248 jcontext_menu_populator); 339 jcontext_menu_populator);
249 WindowAndroidHelper::FromWebContents(web_contents())-> 340 WindowAndroidHelper::FromWebContents(web_contents())->
250 SetWindowAndroid(content_view_core->GetWindowAndroid()); 341 SetWindowAndroid(content_view_core->GetWindowAndroid());
251 CoreTabHelper::FromWebContents(web_contents())->set_delegate(this); 342 CoreTabHelper::FromWebContents(web_contents())->set_delegate(this);
252 web_contents_delegate_.reset( 343 web_contents_delegate_.reset(
253 new chrome::android::ChromeWebContentsDelegateAndroid( 344 new chrome::android::ChromeWebContentsDelegateAndroid(
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 460
370 static void Init(JNIEnv* env, jobject obj) { 461 static void Init(JNIEnv* env, jobject obj) {
371 TRACE_EVENT0("native", "TabAndroid::Init"); 462 TRACE_EVENT0("native", "TabAndroid::Init");
372 // This will automatically bind to the Java object and pass ownership there. 463 // This will automatically bind to the Java object and pass ownership there.
373 new TabAndroid(env, obj); 464 new TabAndroid(env, obj);
374 } 465 }
375 466
376 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { 467 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
377 return RegisterNativesImpl(env); 468 return RegisterNativesImpl(env);
378 } 469 }
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698