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

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 6854035: Move blocked content from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 676b7e0d218d299add442488143675951112843e..5929b4835cdc284efeb3d9bce9aff4063f4a3863 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_model.h"
+#include "chrome/browser/ui/content_settings/content_settings_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
@@ -260,7 +261,7 @@ void InstantController::CommitCurrentPreview(InstantCommitType type) {
tab->controller().CopyStateFromAndPrune(
&tab_contents_->controller(), showing_instant);
delegate_->CommitInstant(tab);
- CompleteRelease(tab->tab_contents());
+ CompleteRelease(tab);
}
void InstantController::SetCommitOnMouseUp() {
@@ -382,8 +383,8 @@ TabContentsWrapper* InstantController::ReleasePreviewContents(
return tab;
}
-void InstantController::CompleteRelease(TabContents* tab) {
- tab->SetAllContentsBlocked(false);
+void InstantController::CompleteRelease(TabContentsWrapper* tab) {
+ tab->content_settings_tab_helper()->SetAllContentsBlocked(false);
}
TabContentsWrapper* InstantController::GetPreviewContents() {

Powered by Google App Engine
This is Rietveld 408576698