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

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

Issue 3040034: Block non-sandboxed plugins. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: fix indentation; sync Created 10 years, 4 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
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/chrome_browser.gypi » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #if defined(OS_CHROMEOS) 7 #if defined(OS_CHROMEOS)
8 // For GdkScreen 8 // For GdkScreen
9 #include <gdk/gdk.h> 9 #include <gdk/gdk.h>
10 #endif // defined(OS_CHROMEOS) 10 #endif // defined(OS_CHROMEOS)
11 11
12 #include "app/l10n_util.h" 12 #include "app/l10n_util.h"
13 #include "app/resource_bundle.h" 13 #include "app/resource_bundle.h"
14 #include "app/text_elider.h" 14 #include "app/text_elider.h"
15 #include "base/auto_reset.h" 15 #include "base/auto_reset.h"
16 #include "base/file_version_info.h" 16 #include "base/file_version_info.h"
17 #include "base/i18n/rtl.h" 17 #include "base/i18n/rtl.h"
18 #include "base/process_util.h" 18 #include "base/process_util.h"
19 #include "base/string16.h" 19 #include "base/string16.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/time.h" 21 #include "base/time.h"
22 #include "chrome/browser/autocomplete_history_manager.h" 22 #include "chrome/browser/autocomplete_history_manager.h"
23 #include "chrome/browser/autofill/autofill_manager.h" 23 #include "chrome/browser/autofill/autofill_manager.h"
24 #include "chrome/browser/blocked_plugin_manager.h"
24 #include "chrome/browser/blocked_popup_container.h" 25 #include "chrome/browser/blocked_popup_container.h"
25 #include "chrome/browser/bookmarks/bookmark_model.h" 26 #include "chrome/browser/bookmarks/bookmark_model.h"
26 #include "chrome/browser/browser.h" 27 #include "chrome/browser/browser.h"
27 #include "chrome/browser/browser_process.h" 28 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/browser_shutdown.h" 29 #include "chrome/browser/browser_shutdown.h"
29 #include "chrome/browser/cert_store.h" 30 #include "chrome/browser/cert_store.h"
30 #include "chrome/browser/character_encoding.h" 31 #include "chrome/browser/character_encoding.h"
31 #include "chrome/browser/debugger/devtools_manager.h" 32 #include "chrome/browser/debugger/devtools_manager.h"
32 #include "chrome/browser/dom_operation_notification_details.h" 33 #include "chrome/browser/dom_operation_notification_details.h"
33 #include "chrome/browser/dom_ui/dom_ui.h" 34 #include "chrome/browser/dom_ui/dom_ui.h"
(...skipping 2141 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 RenderViewHostDelegate::Autocomplete* TabContents::GetAutocompleteDelegate() { 2176 RenderViewHostDelegate::Autocomplete* TabContents::GetAutocompleteDelegate() {
2176 if (autocomplete_history_manager_.get() == NULL) 2177 if (autocomplete_history_manager_.get() == NULL)
2177 autocomplete_history_manager_.reset(new AutocompleteHistoryManager(this)); 2178 autocomplete_history_manager_.reset(new AutocompleteHistoryManager(this));
2178 return autocomplete_history_manager_.get(); 2179 return autocomplete_history_manager_.get();
2179 } 2180 }
2180 2181
2181 RenderViewHostDelegate::AutoFill* TabContents::GetAutoFillDelegate() { 2182 RenderViewHostDelegate::AutoFill* TabContents::GetAutoFillDelegate() {
2182 return GetAutoFillManager(); 2183 return GetAutoFillManager();
2183 } 2184 }
2184 2185
2186 RenderViewHostDelegate::BlockedPlugin* TabContents::GetBlockedPluginDelegate() {
2187 if (blocked_plugin_manager_.get() == NULL)
2188 blocked_plugin_manager_.reset(new BlockedPluginManager(this));
2189 return blocked_plugin_manager_.get();
2190 }
2191
2185 RenderViewHostDelegate::SSL* TabContents::GetSSLDelegate() { 2192 RenderViewHostDelegate::SSL* TabContents::GetSSLDelegate() {
2186 return GetSSLHelper(); 2193 return GetSSLHelper();
2187 } 2194 }
2188 2195
2189 AutomationResourceRoutingDelegate* 2196 AutomationResourceRoutingDelegate*
2190 TabContents::GetAutomationResourceRoutingDelegate() { 2197 TabContents::GetAutomationResourceRoutingDelegate() {
2191 return delegate(); 2198 return delegate();
2192 } 2199 }
2193 2200
2194 RenderViewHostDelegate::BookmarkDrag* TabContents::GetBookmarkDragDelegate() { 2201 RenderViewHostDelegate::BookmarkDrag* TabContents::GetBookmarkDragDelegate() {
(...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after
3255 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save)); 3262 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
3256 } 3263 }
3257 3264
3258 Profile* TabContents::GetProfileForPasswordManager() { 3265 Profile* TabContents::GetProfileForPasswordManager() {
3259 return profile(); 3266 return profile();
3260 } 3267 }
3261 3268
3262 bool TabContents::DidLastPageLoadEncounterSSLErrors() { 3269 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
3263 return controller().ssl_manager()->ProcessedSSLErrorFromRequest(); 3270 return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
3264 } 3271 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698