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

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

Issue 7650027: Update Chromium to use new signature for (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/renderer/render_view.h" 5 #include "content/renderer/render_view.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 2820 matching lines...) Expand 10 before | Expand all | Expand 10 after
2831 } 2831 }
2832 2832
2833 void RenderView::didCreateScriptContext(WebFrame* frame) { 2833 void RenderView::didCreateScriptContext(WebFrame* frame) {
2834 content::GetContentClient()->renderer()->DidCreateScriptContext(frame); 2834 content::GetContentClient()->renderer()->DidCreateScriptContext(frame);
2835 } 2835 }
2836 2836
2837 void RenderView::didDestroyScriptContext(WebFrame* frame) { 2837 void RenderView::didDestroyScriptContext(WebFrame* frame) {
2838 content::GetContentClient()->renderer()->DidDestroyScriptContext(frame); 2838 content::GetContentClient()->renderer()->DidDestroyScriptContext(frame);
2839 } 2839 }
2840 2840
2841 void RenderView::didCreateIsolatedScriptContext(WebFrame* frame) { 2841 void RenderView::didCreateIsolatedScriptContext(
2842 WebFrame* frame, int world_id, v8::Handle<v8::Context> context) {
2842 content::GetContentClient()->renderer()->DidCreateIsolatedScriptContext( 2843 content::GetContentClient()->renderer()->DidCreateIsolatedScriptContext(
2843 frame); 2844 frame, world_id, context);
2844 } 2845 }
2845 2846
2846 void RenderView::didUpdateLayout(WebFrame* frame) { 2847 void RenderView::didUpdateLayout(WebFrame* frame) {
2847 // We don't always want to set up a timer, only if we've been put in that 2848 // We don't always want to set up a timer, only if we've been put in that
2848 // mode by getting a |ViewMsg_EnablePreferredSizeChangedMode| 2849 // mode by getting a |ViewMsg_EnablePreferredSizeChangedMode|
2849 // message. 2850 // message.
2850 if (!send_preferred_size_changes_ || !webview()) 2851 if (!send_preferred_size_changes_ || !webview())
2851 return; 2852 return;
2852 2853
2853 if (check_preferred_size_timer_.IsRunning()) 2854 if (check_preferred_size_timer_.IsRunning())
(...skipping 1677 matching lines...) Expand 10 before | Expand all | Expand 10 after
4531 } 4532 }
4532 #endif 4533 #endif
4533 4534
4534 void RenderView::OnContextMenuClosed( 4535 void RenderView::OnContextMenuClosed(
4535 const webkit_glue::CustomContextMenuContext& custom_context) { 4536 const webkit_glue::CustomContextMenuContext& custom_context) {
4536 if (custom_context.is_pepper_menu) 4537 if (custom_context.is_pepper_menu)
4537 pepper_delegate_.OnContextMenuClosed(custom_context); 4538 pepper_delegate_.OnContextMenuClosed(custom_context);
4538 else 4539 else
4539 context_menu_node_.reset(); 4540 context_menu_node_.reset();
4540 } 4541 }
OLDNEW
« chrome/renderer/chrome_content_renderer_client.cc ('K') | « content/renderer/render_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698