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

Side by Side Diff: content/browser/tab_contents/interstitial_page.cc

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 11 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/tab_contents/interstitial_page.h" 5 #include "content/browser/tab_contents/interstitial_page.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 189
190 if (new_navigation_) { 190 if (new_navigation_) {
191 NavigationEntryImpl* entry = new NavigationEntryImpl; 191 NavigationEntryImpl* entry = new NavigationEntryImpl;
192 entry->SetURL(url_); 192 entry->SetURL(url_);
193 entry->SetVirtualURL(url_); 193 entry->SetVirtualURL(url_);
194 entry->set_page_type(content::PAGE_TYPE_INTERSTITIAL); 194 entry->set_page_type(content::PAGE_TYPE_INTERSTITIAL);
195 195
196 // Give sub-classes a chance to set some states on the navigation entry. 196 // Give sub-classes a chance to set some states on the navigation entry.
197 UpdateEntry(entry); 197 UpdateEntry(entry);
198 198
199 tab_->GetController().AddTransientEntry(entry); 199 tab_->GetControllerImpl().AddTransientEntry(entry);
200 } 200 }
201 201
202 DCHECK(!render_view_host_); 202 DCHECK(!render_view_host_);
203 render_view_host_ = CreateRenderViewHost(); 203 render_view_host_ = CreateRenderViewHost();
204 CreateTabContentsView(); 204 CreateTabContentsView();
205 205
206 std::string data_url = "data:text/html;charset=utf-8," + 206 std::string data_url = "data:text/html;charset=utf-8," +
207 net::EscapePath(GetHTMLContents()); 207 net::EscapePath(GetHTMLContents());
208 render_view_host_->NavigateToURL(GURL(data_url)); 208 render_view_host_->NavigateToURL(GURL(data_url));
209 209
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 if (!tab->GetViewDelegate()) 684 if (!tab->GetViewDelegate())
685 return; 685 return;
686 686
687 tab->GetViewDelegate()->TakeFocus(reverse); 687 tab->GetViewDelegate()->TakeFocus(reverse);
688 } 688 }
689 689
690 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply( 690 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
691 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 691 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
692 int active_match_ordinal, bool final_update) { 692 int active_match_ordinal, bool final_update) {
693 } 693 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698