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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 9583026: Prepare for a change in contract to WebViewClient::createView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/tools/test_shell/test_webview_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 // that would defer resource loads for the dialog itself. 1411 // that would defer resource loads for the dialog itself.
1412 if (RenderThreadImpl::current()) // Will be NULL during unit tests. 1412 if (RenderThreadImpl::current()) // Will be NULL during unit tests.
1413 RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop(); 1413 RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop();
1414 1414
1415 message->EnableMessagePumping(); // Runs a nested message loop. 1415 message->EnableMessagePumping(); // Runs a nested message loop.
1416 return Send(message); 1416 return Send(message);
1417 } 1417 }
1418 1418
1419 // WebKit::WebViewClient ------------------------------------------------------ 1419 // WebKit::WebViewClient ------------------------------------------------------
1420 1420
1421 // TODO(creis): New contract for createView temporarily redirects to the old
1422 // contract. Remove the old one as part of http://crbug.com/69267.
1423 WebView* RenderViewImpl::createView(
1424 WebFrame* creator,
1425 const WebURLRequest& request,
1426 const WebWindowFeatures& features,
1427 const WebString& frame_name,
1428 WebNavigationPolicy policy) {
1429 return createView(creator, request, features, frame_name);
1430 }
1431
1421 WebView* RenderViewImpl::createView( 1432 WebView* RenderViewImpl::createView(
1422 WebFrame* creator, 1433 WebFrame* creator,
1423 const WebURLRequest& request, 1434 const WebURLRequest& request,
1424 const WebWindowFeatures& features, 1435 const WebWindowFeatures& features,
1425 const WebString& frame_name) { 1436 const WebString& frame_name) {
1426 // Check to make sure we aren't overloading on popups. 1437 // Check to make sure we aren't overloading on popups.
1427 if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups) 1438 if (shared_popup_counter_->data > kMaximumNumberOfUnacknowledgedPopups)
1428 return NULL; 1439 return NULL;
1429 1440
1430 ViewHostMsg_CreateWindow_Params params; 1441 ViewHostMsg_CreateWindow_Params params;
(...skipping 3649 matching lines...) Expand 10 before | Expand all | Expand 10 after
5080 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5091 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5081 return !!RenderThreadImpl::current()->compositor_thread(); 5092 return !!RenderThreadImpl::current()->compositor_thread();
5082 } 5093 }
5083 5094
5084 void RenderViewImpl::OnJavaBridgeInit() { 5095 void RenderViewImpl::OnJavaBridgeInit() {
5085 DCHECK(!java_bridge_dispatcher_.get()); 5096 DCHECK(!java_bridge_dispatcher_.get());
5086 #if defined(ENABLE_JAVA_BRIDGE) 5097 #if defined(ENABLE_JAVA_BRIDGE)
5087 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5098 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5088 #endif 5099 #endif
5089 } 5100 }
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/tools/test_shell/test_webview_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698