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

Side by Side Diff: chrome/browser/instant/instant_loader.cc

Issue 12387089: Instant: Rename 'preview' to 'overlay' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/instant/instant_loader.h" 5 #include "chrome/browser/instant/instant_loader.h"
6 6
7 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 7 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
8 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" 8 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
9 #include "chrome/browser/favicon/favicon_tab_helper.h" 9 #include "chrome/browser/favicon/favicon_tab_helper.h"
10 #include "chrome/browser/history/history_tab_helper.h" 10 #include "chrome/browser/history/history_tab_helper.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 BlockedContentTabHelper::FromWebContents(contents())-> 78 BlockedContentTabHelper::FromWebContents(contents())->
79 SetAllContentsBlocked(true); 79 SetAllContentsBlocked(true);
80 TabSpecificContentSettings::CreateForWebContents(contents()); 80 TabSpecificContentSettings::CreateForWebContents(contents());
81 TabSpecificContentSettings::FromWebContents(contents())-> 81 TabSpecificContentSettings::FromWebContents(contents())->
82 SetPopupsBlocked(true); 82 SetPopupsBlocked(true);
83 83
84 // A tab helper to catch prerender content swapping shenanigans. 84 // A tab helper to catch prerender content swapping shenanigans.
85 CoreTabHelper::CreateForWebContents(contents()); 85 CoreTabHelper::CreateForWebContents(contents());
86 CoreTabHelper::FromWebContents(contents())->set_delegate(this); 86 CoreTabHelper::FromWebContents(contents())->set_delegate(this);
87 87
88 // Tab helpers used when committing a preview. 88 // Tab helpers used when committing an overlay.
89 chrome::search::SearchTabHelper::CreateForWebContents(contents()); 89 chrome::search::SearchTabHelper::CreateForWebContents(contents());
90 HistoryTabHelper::CreateForWebContents(contents()); 90 HistoryTabHelper::CreateForWebContents(contents());
91 91
92 // Observers. 92 // Observers.
93 extensions::WebNavigationTabObserver::CreateForWebContents(contents()); 93 extensions::WebNavigationTabObserver::CreateForWebContents(contents());
94 94
95 // Favicons, required by the Task Manager. 95 // Favicons, required by the Task Manager.
96 FaviconTabHelper::CreateForWebContents(contents()); 96 FaviconTabHelper::CreateForWebContents(contents());
97 97
98 // And some flat-out paranoia. 98 // And some flat-out paranoia.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 207
208 bool InstantLoader::OnGoToEntryOffset(int /* offset */) { 208 bool InstantLoader::OnGoToEntryOffset(int /* offset */) {
209 return false; 209 return false;
210 } 210 }
211 211
212 content::WebContents* InstantLoader::OpenURLFromTab( 212 content::WebContents* InstantLoader::OpenURLFromTab(
213 content::WebContents* source, 213 content::WebContents* source,
214 const content::OpenURLParams& params) { 214 const content::OpenURLParams& params) {
215 return delegate_->OpenURLFromTab(source, params); 215 return delegate_->OpenURLFromTab(source, params);
216 } 216 }
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_extended_browsertest.cc ('k') | chrome/browser/instant/instant_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698