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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10732002: Upstream rewrite of Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge test Created 8 years, 5 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: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6d5453aa662cdf1de7d2aa4fec73f9603ce147bf..79db04a037571abe95a5e13e2db760dae6c04359 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -921,7 +921,8 @@ void WebContentsImpl::WasRestored() {
#if defined(OS_MACOSX)
rwhv->SetActive(true);
#endif
- }
+ } else
+ LOG(WARNING) << "Restoring web contents with no rwhv";
last_selected_time_ = base::TimeTicks::Now();
@@ -931,9 +932,8 @@ void WebContentsImpl::WasRestored() {
// one to make sure it's up to date.
RenderViewHostImpl* rvh =
static_cast<RenderViewHostImpl*>(GetRenderViewHost());
- if (rvh) {
+ if (rvh)
rvh->ResizeRectChanged(GetRootWindowResizerRect());
- }
bool is_visible = true;
content::NotificationService::current()->Notify(
« chrome/browser/instant/instant_loader.cc ('K') | « chrome/renderer/searchbox_extension.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698