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

Side by Side Diff: trunk/src/content/renderer/render_frame_impl.h

Issue 177713006: Revert 251563 "Move browser initiated navigation from RenderView..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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 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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/id_map.h" 13 #include "base/id_map.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "base/process/process_handle.h" 16 #include "base/process/process_handle.h"
17 #include "base/strings/string16.h" 17 #include "base/strings/string16.h"
18 #include "content/public/renderer/render_frame.h" 18 #include "content/public/renderer/render_frame.h"
19 #include "content/renderer/renderer_webcookiejar_impl.h" 19 #include "content/renderer/renderer_webcookiejar_impl.h"
20 #include "ipc/ipc_message.h" 20 #include "ipc/ipc_message.h"
21 #include "third_party/WebKit/public/web/WebDataSource.h" 21 #include "third_party/WebKit/public/web/WebDataSource.h"
22 #include "third_party/WebKit/public/web/WebFrameClient.h" 22 #include "third_party/WebKit/public/web/WebFrameClient.h"
23 23
24 class TransportDIB; 24 class TransportDIB;
25 struct FrameMsg_BuffersSwapped_Params; 25 struct FrameMsg_BuffersSwapped_Params;
26 struct FrameMsg_CompositorFrameSwapped_Params; 26 struct FrameMsg_CompositorFrameSwapped_Params;
27 struct FrameMsg_Navigate_Params;
28 27
29 namespace blink { 28 namespace blink {
30 class WebInputEvent; 29 class WebInputEvent;
31 class WebMouseEvent; 30 class WebMouseEvent;
32 struct WebCompositionUnderline; 31 struct WebCompositionUnderline;
33 struct WebContextMenuData; 32 struct WebContextMenuData;
34 struct WebCursorInfo; 33 struct WebCursorInfo;
35 } 34 }
36 35
37 namespace gfx { 36 namespace gfx {
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 virtual bool allowWebGL(blink::WebFrame* frame, bool default_value); 323 virtual bool allowWebGL(blink::WebFrame* frame, bool default_value);
325 virtual void didLoseWebGLContext(blink::WebFrame* frame, 324 virtual void didLoseWebGLContext(blink::WebFrame* frame,
326 int arb_robustness_status_code); 325 int arb_robustness_status_code);
327 virtual void forwardInputEvent(const blink::WebInputEvent* event); 326 virtual void forwardInputEvent(const blink::WebInputEvent* event);
328 virtual void initializeChildFrame(const blink::WebRect& frame_rect, 327 virtual void initializeChildFrame(const blink::WebRect& frame_rect,
329 float scale_factor); 328 float scale_factor);
330 329
331 // TODO(jam): move this to WebFrameClient 330 // TODO(jam): move this to WebFrameClient
332 virtual void showContextMenu(const blink::WebContextMenuData& data); 331 virtual void showContextMenu(const blink::WebContextMenuData& data);
333 332
334 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
335 // this back to private member.
336 void OnNavigate(const FrameMsg_Navigate_Params& params);
337
338 protected: 333 protected:
339 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); 334 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
340 335
341 private: 336 private:
342 friend class RenderFrameObserver; 337 friend class RenderFrameObserver;
343 FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest, 338 FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
344 ShouldUpdateSelectionTextFromContextMenuParams); 339 ShouldUpdateSelectionTextFromContextMenuParams);
345 340
346 typedef std::map<GURL, double> HostZoomLevels; 341 typedef std::map<GURL, double> HostZoomLevels;
347 342
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 // always respond properly to the request, so we don't have to worry so 400 // always respond properly to the request, so we don't have to worry so
406 // much about leaks. 401 // much about leaks.
407 IDMap<ContextMenuClient, IDMapExternalPointer> pending_context_menus_; 402 IDMap<ContextMenuClient, IDMapExternalPointer> pending_context_menus_;
408 403
409 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 404 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
410 }; 405 };
411 406
412 } // namespace content 407 } // namespace content
413 408
414 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 409 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/notification_provider.cc ('k') | trunk/src/content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698