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

Side by Side Diff: chrome/browser/ui/tab_contents/tab_contents.cc

Issue 11416013: Move RequestPpapiBrokerPermission from WebContentsObserver to WebContentsDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android Created 8 years, 1 month 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/ui/browser.cc ('k') | chrome/browser/ui/views/external_tab_container_win.h » ('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/ui/tab_contents/tab_contents.h" 5 #include "chrome/browser/ui/tab_contents/tab_contents.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "chrome/browser/autofill/autofill_external_delegate.h" 10 #include "chrome/browser/autofill/autofill_external_delegate.h"
11 #include "chrome/browser/autofill/autofill_manager.h" 11 #include "chrome/browser/autofill/autofill_manager.h"
12 #include "chrome/browser/automation/automation_tab_helper.h" 12 #include "chrome/browser/automation/automation_tab_helper.h"
13 #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/api/web_navigation/web_navigation_api.h" 14 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
15 #include "chrome/browser/extensions/tab_helper.h" 15 #include "chrome/browser/extensions/tab_helper.h"
16 #include "chrome/browser/external_protocol/external_protocol_observer.h" 16 #include "chrome/browser/external_protocol/external_protocol_observer.h"
17 #include "chrome/browser/favicon/favicon_tab_helper.h" 17 #include "chrome/browser/favicon/favicon_tab_helper.h"
18 #include "chrome/browser/history/history_tab_helper.h" 18 #include "chrome/browser/history/history_tab_helper.h"
19 #include "chrome/browser/infobars/infobar_tab_helper.h" 19 #include "chrome/browser/infobars/infobar_tab_helper.h"
20 #include "chrome/browser/net/load_time_stats.h" 20 #include "chrome/browser/net/load_time_stats.h"
21 #include "chrome/browser/net/net_error_tab_helper.h" 21 #include "chrome/browser/net/net_error_tab_helper.h"
22 #include "chrome/browser/omnibox_search_hint.h" 22 #include "chrome/browser/omnibox_search_hint.h"
23 #include "chrome/browser/password_manager/password_manager.h" 23 #include "chrome/browser/password_manager/password_manager.h"
24 #include "chrome/browser/password_manager/password_manager_delegate_impl.h" 24 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"
25 #include "chrome/browser/pepper_broker_observer.h"
26 #include "chrome/browser/plugins/plugin_observer.h" 25 #include "chrome/browser/plugins/plugin_observer.h"
27 #include "chrome/browser/prerender/prerender_tab_helper.h" 26 #include "chrome/browser/prerender/prerender_tab_helper.h"
28 #include "chrome/browser/printing/print_preview_message_handler.h" 27 #include "chrome/browser/printing/print_preview_message_handler.h"
29 #include "chrome/browser/printing/print_view_manager.h" 28 #include "chrome/browser/printing/print_view_manager.h"
30 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h" 29 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
31 #include "chrome/browser/sessions/session_tab_helper.h" 30 #include "chrome/browser/sessions/session_tab_helper.h"
32 #include "chrome/browser/ssl/ssl_tab_helper.h" 31 #include "chrome/browser/ssl/ssl_tab_helper.h"
33 #include "chrome/browser/tab_contents/navigation_metrics_recorder.h" 32 #include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
34 #include "chrome/browser/three_d_api_observer.h" 33 #include "chrome/browser/three_d_api_observer.h"
35 #include "chrome/browser/thumbnails/thumbnail_tab_helper.h" 34 #include "chrome/browser/thumbnails/thumbnail_tab_helper.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 ExternalProtocolObserver::CreateForWebContents(contents); 143 ExternalProtocolObserver::CreateForWebContents(contents);
145 FaviconTabHelper::CreateForWebContents(contents); 144 FaviconTabHelper::CreateForWebContents(contents);
146 FindTabHelper::CreateForWebContents(contents); 145 FindTabHelper::CreateForWebContents(contents);
147 HistoryTabHelper::CreateForWebContents(contents); 146 HistoryTabHelper::CreateForWebContents(contents);
148 HungPluginTabHelper::CreateForWebContents(contents); 147 HungPluginTabHelper::CreateForWebContents(contents);
149 InfoBarTabHelper::CreateForWebContents(contents); 148 InfoBarTabHelper::CreateForWebContents(contents);
150 NavigationMetricsRecorder::CreateForWebContents(contents); 149 NavigationMetricsRecorder::CreateForWebContents(contents);
151 PasswordManagerDelegateImpl::CreateForWebContents(contents); 150 PasswordManagerDelegateImpl::CreateForWebContents(contents);
152 PasswordManager::CreateForWebContentsAndDelegate( 151 PasswordManager::CreateForWebContentsAndDelegate(
153 contents, PasswordManagerDelegateImpl::FromWebContents(contents)); 152 contents, PasswordManagerDelegateImpl::FromWebContents(contents));
154 PepperBrokerObserver::CreateForWebContents(contents);
155 PluginObserver::CreateForWebContents(contents); 153 PluginObserver::CreateForWebContents(contents);
156 PrefsTabHelper::CreateForWebContents(contents); 154 PrefsTabHelper::CreateForWebContents(contents);
157 prerender::PrerenderTabHelper::CreateForWebContents(contents); 155 prerender::PrerenderTabHelper::CreateForWebContents(contents);
158 safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(contents); 156 safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(contents);
159 SearchEngineTabHelper::CreateForWebContents(contents); 157 SearchEngineTabHelper::CreateForWebContents(contents);
160 chrome::search::SearchTabHelper::CreateForWebContents(contents); 158 chrome::search::SearchTabHelper::CreateForWebContents(contents);
161 SnapshotTabHelper::CreateForWebContents(contents); 159 SnapshotTabHelper::CreateForWebContents(contents);
162 SSLTabHelper::CreateForWebContents(contents); 160 SSLTabHelper::CreateForWebContents(contents);
163 TabContentsSyncedTabDelegate::CreateForWebContents(contents); 161 TabContentsSyncedTabDelegate::CreateForWebContents(contents);
164 TabSpecificContentSettings::CreateForWebContents(contents); 162 TabSpecificContentSettings::CreateForWebContents(contents);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 239
242 void TabContents::WebContentsDestroyed(WebContents* tab) { 240 void TabContents::WebContentsDestroyed(WebContents* tab) {
243 if (!in_destructor_) { 241 if (!in_destructor_) {
244 // The owned WebContents is being destroyed independently, so delete this. 242 // The owned WebContents is being destroyed independently, so delete this.
245 ignore_result(owned_web_contents_.release()); 243 ignore_result(owned_web_contents_.release());
246 TabContentsUserData* user_data = static_cast<TabContentsUserData*>( 244 TabContentsUserData* user_data = static_cast<TabContentsUserData*>(
247 tab->GetUserData(&kTabContentsUserDataKey)); 245 tab->GetUserData(&kTabContentsUserDataKey));
248 user_data->MakeContentsOwned(); 246 user_data->MakeContentsOwned();
249 } 247 }
250 } 248 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/views/external_tab_container_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698