OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
153 } | 153 } |
154 #endif // ENABLE_PLUGINS | 154 #endif // ENABLE_PLUGINS |
155 | 155 |
156 // IPC::Sender | 156 // IPC::Sender |
157 virtual bool Send(IPC::Message* msg) OVERRIDE; | 157 virtual bool Send(IPC::Message* msg) OVERRIDE; |
158 | 158 |
159 // IPC::Listener | 159 // IPC::Listener |
160 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; | 160 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; |
161 | 161 |
162 // RenderFrame implementation: | 162 // RenderFrame implementation: |
163 virtual int GetRoutingID() OVERRIDE; | |
nasko
2013/12/05 22:43:45
Does it make sense to have both routing_id() and G
jam
2013/12/05 23:14:07
yep only one needed, removed routing_id()
| |
163 virtual blink::WebPlugin* CreatePlugin( | 164 virtual blink::WebPlugin* CreatePlugin( |
164 blink::WebFrame* frame, | 165 blink::WebFrame* frame, |
165 const WebPluginInfo& info, | 166 const WebPluginInfo& info, |
166 const blink::WebPluginParams& params) OVERRIDE; | 167 const blink::WebPluginParams& params) OVERRIDE; |
167 | 168 |
168 // blink::WebFrameClient implementation ------------------------------------- | 169 // blink::WebFrameClient implementation ------------------------------------- |
169 virtual blink::WebPlugin* createPlugin( | 170 virtual blink::WebPlugin* createPlugin( |
170 blink::WebFrame* frame, | 171 blink::WebFrame* frame, |
171 const blink::WebPluginParams& params); | 172 const blink::WebPluginParams& params); |
172 virtual blink::WebMediaPlayer* createMediaPlayer( | 173 virtual blink::WebMediaPlayer* createMediaPlayer( |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
345 | 346 |
346 // All the registered observers. | 347 // All the registered observers. |
347 ObserverList<RenderFrameObserver> observers_; | 348 ObserverList<RenderFrameObserver> observers_; |
348 | 349 |
349 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 350 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
350 }; | 351 }; |
351 | 352 |
352 } // namespace content | 353 } // namespace content |
353 | 354 |
354 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 355 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |