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

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

Issue 8773035: Content settings: allow scripts on interstitial pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review. Created 9 years 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_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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 #endif 687 #endif
688 #if defined(OS_MACOSX) 688 #if defined(OS_MACOSX)
689 IPC_MESSAGE_HANDLER(ViewMsg_SetInLiveResize, OnSetInLiveResize) 689 IPC_MESSAGE_HANDLER(ViewMsg_SetInLiveResize, OnSetInLiveResize)
690 #endif 690 #endif
691 IPC_MESSAGE_HANDLER(ViewMsg_SetHistoryLengthAndPrune, 691 IPC_MESSAGE_HANDLER(ViewMsg_SetHistoryLengthAndPrune,
692 OnSetHistoryLengthAndPrune) 692 OnSetHistoryLengthAndPrune)
693 IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode) 693 IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode)
694 IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK) 694 IPC_MESSAGE_HANDLER(ViewMsg_LockMouse_ACK, OnLockMouseACK)
695 IPC_MESSAGE_HANDLER(ViewMsg_MouseLockLost, OnMouseLockLost) 695 IPC_MESSAGE_HANDLER(ViewMsg_MouseLockLost, OnMouseLockLost)
696 IPC_MESSAGE_HANDLER(JavaBridgeMsg_Init, OnJavaBridgeInit) 696 IPC_MESSAGE_HANDLER(JavaBridgeMsg_Init, OnJavaBridgeInit)
697 IPC_MESSAGE_HANDLER(ViewMsg_SetAsInterstitial, OnSetAsInterstitial)
697 698
698 // Have the super handle all other messages. 699 // Have the super handle all other messages.
699 IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message)) 700 IPC_MESSAGE_UNHANDLED(handled = RenderWidget::OnMessageReceived(message))
700 IPC_END_MESSAGE_MAP() 701 IPC_END_MESSAGE_MAP()
701 702
702 if (!msg_is_ok) { 703 if (!msg_is_ok) {
703 // The message had a handler, but its deserialization failed. 704 // The message had a handler, but its deserialization failed.
704 // Kill the renderer to avoid potential spoofing attacks. 705 // Kill the renderer to avoid potential spoofing attacks.
705 CHECK(false) << "Unable to deserialize message in RenderViewImpl."; 706 CHECK(false) << "Unable to deserialize message in RenderViewImpl.";
706 } 707 }
(...skipping 4042 matching lines...) Expand 10 before | Expand all | Expand 10 after
4749 return !!RenderThreadImpl::current()->compositor_thread(); 4750 return !!RenderThreadImpl::current()->compositor_thread();
4750 } 4751 }
4751 4752
4752 void RenderViewImpl::OnJavaBridgeInit( 4753 void RenderViewImpl::OnJavaBridgeInit(
4753 const IPC::ChannelHandle& channel_handle) { 4754 const IPC::ChannelHandle& channel_handle) {
4754 DCHECK(!java_bridge_dispatcher_.get()); 4755 DCHECK(!java_bridge_dispatcher_.get());
4755 #if defined(ENABLE_JAVA_BRIDGE) 4756 #if defined(ENABLE_JAVA_BRIDGE)
4756 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4757 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4757 #endif 4758 #endif
4758 } 4759 }
4760
4761 void RenderViewImpl::OnSetAsInterstitial() {
4762 FOR_EACH_OBSERVER(RenderViewObserver, observers_, SetAsInterstitial());
4763 }
OLDNEW
« content/renderer/render_view_impl.h ('K') | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698