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

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

Issue 3118009: Reapplies r55735, fixing some message code that was checked in that I collided with. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
« no previous file with comments | « chrome/common/webkit_param_traits.cc ('k') | ipc/ipc_message_impl_macros.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h" 88 #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h"
89 #include "third_party/skia/include/core/SkBitmap.h" 89 #include "third_party/skia/include/core/SkBitmap.h"
90 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h" 90 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h"
91 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" 91 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
92 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h" 92 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
93 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" 93 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h"
94 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h" 94 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
95 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" 95 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
96 #include "third_party/WebKit/WebKit/chromium/public/WebDragData.h" 96 #include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
97 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h" 97 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h"
98 #include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h"
98 #include "third_party/WebKit/WebKit/chromium/public/WebFormControlElement.h" 99 #include "third_party/WebKit/WebKit/chromium/public/WebFormControlElement.h"
99 #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h" 100 #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
100 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" 101 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
101 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h" 102 #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
102 #include "third_party/WebKit/WebKit/chromium/public/WebImage.h" 103 #include "third_party/WebKit/WebKit/chromium/public/WebImage.h"
103 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h" 104 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
104 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h" 105 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
105 #include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h" 106 #include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h"
106 #include "third_party/WebKit/WebKit/chromium/public/WebPageSerializer.h" 107 #include "third_party/WebKit/WebKit/chromium/public/WebPageSerializer.h"
107 #include "third_party/WebKit/WebKit/chromium/public/WebPlugin.h" 108 #include "third_party/WebKit/WebKit/chromium/public/WebPlugin.h"
(...skipping 29 matching lines...) Expand all
137 #include "webkit/glue/media/video_renderer_impl.h" 138 #include "webkit/glue/media/video_renderer_impl.h"
138 #include "webkit/glue/password_form_dom_manager.h" 139 #include "webkit/glue/password_form_dom_manager.h"
139 #include "webkit/glue/plugins/default_plugin_shared.h" 140 #include "webkit/glue/plugins/default_plugin_shared.h"
140 #include "webkit/glue/plugins/pepper_webplugin_impl.h" 141 #include "webkit/glue/plugins/pepper_webplugin_impl.h"
141 #include "webkit/glue/plugins/plugin_list.h" 142 #include "webkit/glue/plugins/plugin_list.h"
142 #include "webkit/glue/plugins/webplugin_delegate.h" 143 #include "webkit/glue/plugins/webplugin_delegate.h"
143 #include "webkit/glue/plugins/webplugin_delegate_impl.h" 144 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
144 #include "webkit/glue/plugins/webplugin_impl.h" 145 #include "webkit/glue/plugins/webplugin_impl.h"
145 #include "webkit/glue/plugins/webview_plugin.h" 146 #include "webkit/glue/plugins/webview_plugin.h"
146 #include "webkit/glue/site_isolation_metrics.h" 147 #include "webkit/glue/site_isolation_metrics.h"
148 #include "webkit/glue/webaccessibility.h"
147 #include "webkit/glue/webdropdata.h" 149 #include "webkit/glue/webdropdata.h"
148 #include "webkit/glue/webkit_glue.h" 150 #include "webkit/glue/webkit_glue.h"
149 #include "webkit/glue/webmediaplayer_impl.h" 151 #include "webkit/glue/webmediaplayer_impl.h"
150 152
151 #if defined(OS_WIN) 153 #if defined(OS_WIN)
152 // TODO(port): these files are currently Windows only because they concern: 154 // TODO(port): these files are currently Windows only because they concern:
153 // * theming 155 // * theming
154 #include "gfx/native_theme_win.h" 156 #include "gfx/native_theme_win.h"
155 #elif defined(USE_X11) 157 #elif defined(USE_X11)
156 #include "third_party/WebKit/WebKit/chromium/public/linux/WebRenderTheme.h" 158 #include "third_party/WebKit/WebKit/chromium/public/linux/WebRenderTheme.h"
(...skipping 5299 matching lines...) Expand 10 before | Expand all | Expand 10 after
5456 // the origins of the two domains are different. This can be treated as a 5458 // the origins of the two domains are different. This can be treated as a
5457 // top level navigation and routed back to the host. 5459 // top level navigation and routed back to the host.
5458 WebKit::WebFrame* opener = frame->opener(); 5460 WebKit::WebFrame* opener = frame->opener();
5459 if (opener) { 5461 if (opener) {
5460 if (url.GetOrigin() != GURL(opener->url()).GetOrigin()) 5462 if (url.GetOrigin() != GURL(opener->url()).GetOrigin())
5461 return true; 5463 return true;
5462 } 5464 }
5463 } 5465 }
5464 return false; 5466 return false;
5465 } 5467 }
OLDNEW
« no previous file with comments | « chrome/common/webkit_param_traits.cc ('k') | ipc/ipc_message_impl_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698