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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6319001: Support window.opener after a process swap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unload; chrome dependency in RenderWidget. Created 9 years, 7 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 "chrome/browser/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/process_util.h" 9 #include "base/process_util.h"
10 #include "base/task.h" 10 #include "base/task.h"
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 const std::wstring& title) { 406 const std::wstring& title) {
407 DCHECK_EQ(render_view_host_, render_view_host); 407 DCHECK_EQ(render_view_host_, render_view_host);
408 if (title.empty()) 408 if (title.empty())
409 return; 409 return;
410 410
411 title_ = WideToUTF16Hack(title); 411 title_ = WideToUTF16Hack(title);
412 page_id_ = page_id; 412 page_id_ = page_id;
413 } 413 }
414 414
415 void PrerenderContents::RunJavaScriptMessage( 415 void PrerenderContents::RunJavaScriptMessage(
416 const RenderViewHost* rvh,
416 const std::wstring& message, 417 const std::wstring& message,
417 const std::wstring& default_prompt, 418 const std::wstring& default_prompt,
418 const GURL& frame_url, 419 const GURL& frame_url,
419 const int flags, 420 const int flags,
420 IPC::Message* reply_msg, 421 IPC::Message* reply_msg,
421 bool* did_suppress_message) { 422 bool* did_suppress_message) {
422 // Always suppress JavaScript messages if they're triggered by a page being 423 // Always suppress JavaScript messages if they're triggered by a page being
423 // prerendered. 424 // prerendered.
424 *did_suppress_message = true; 425 *did_suppress_message = true;
425 // We still want to show the user the message when they navigate to this 426 // We still want to show the user the message when they navigate to this
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 // used. 728 // used.
728 if (UseTabContents()) { 729 if (UseTabContents()) {
729 if (!prerender_contents_.get()) 730 if (!prerender_contents_.get())
730 return NULL; 731 return NULL;
731 return prerender_contents_->render_view_host(); 732 return prerender_contents_->render_view_host();
732 } 733 }
733 return render_view_host_; 734 return render_view_host_;
734 } 735 }
735 736
736 } // namespace prerender 737 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698