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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.cc

Issue 164071: Merge 22540 - Ensure that we never call into WebCore::Page static methods whe... (Closed) Base URL: svn://chrome-svn/chrome/branches/197/src/
Patch Set: Created 11 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
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/browser/renderer_host/render_view_host.cc:r22540
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/renderer_host/render_view_host.h" 5 #include "chrome/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // Set the alternate error page, which is profile specific, in the renderer. 219 // Set the alternate error page, which is profile specific, in the renderer.
220 GURL url = delegate_->GetAlternateErrorPageURL(); 220 GURL url = delegate_->GetAlternateErrorPageURL();
221 SetAlternateErrorPageURL(url); 221 SetAlternateErrorPageURL(url);
222 222
223 // If it's enabled, tell the renderer to set up the Javascript bindings for 223 // If it's enabled, tell the renderer to set up the Javascript bindings for
224 // sending messages back to the browser. 224 // sending messages back to the browser.
225 Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_)); 225 Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_));
226 226
227 // Let our delegate know that we created a RenderView. 227 // Let our delegate know that we created a RenderView.
228 delegate_->RenderViewCreated(this); 228 delegate_->RenderViewCreated(this);
229 process()->ViewCreated();
229 230
230 return true; 231 return true;
231 } 232 }
232 233
233 bool RenderViewHost::IsRenderViewLive() const { 234 bool RenderViewHost::IsRenderViewLive() const {
234 return process()->HasConnection() && renderer_initialized_; 235 return process()->HasConnection() && renderer_initialized_;
235 } 236 }
236 237
237 void RenderViewHost::SyncRendererPrefs() { 238 void RenderViewHost::SyncRendererPrefs() {
238 Send(new ViewMsg_SetRendererPrefs(routing_id(), 239 Send(new ViewMsg_SetRendererPrefs(routing_id(),
(...skipping 1394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 1634
1634 void RenderViewHost::SignalModalDialogEvent() { 1635 void RenderViewHost::SignalModalDialogEvent() {
1635 if (modal_dialog_count_++ == 0) 1636 if (modal_dialog_count_++ == 0)
1636 modal_dialog_event_->Signal(); 1637 modal_dialog_event_->Signal();
1637 } 1638 }
1638 1639
1639 void RenderViewHost::ResetModalDialogEvent() { 1640 void RenderViewHost::ResetModalDialogEvent() {
1640 if (--modal_dialog_count_ == 0) 1641 if (--modal_dialog_count_ == 0)
1641 modal_dialog_event_->Reset(); 1642 modal_dialog_event_->Reset();
1642 } 1643 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_process_host.h ('k') | chrome/browser/renderer_host/test/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698