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

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

Issue 135723003: Move DidCommitProvisionalLoad code from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Some clean up, ready to start reviewing. Created 6 years, 10 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"
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 virtual void showContextMenu(const blink::WebContextMenuData& data); 331 virtual void showContextMenu(const blink::WebContextMenuData& data);
332 332
333 protected: 333 protected:
334 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); 334 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
335 335
336 private: 336 private:
337 friend class RenderFrameObserver; 337 friend class RenderFrameObserver;
338 FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest, 338 FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest,
339 ShouldUpdateSelectionTextFromContextMenuParams); 339 ShouldUpdateSelectionTextFromContextMenuParams);
340 340
341 typedef std::map<GURL, double> HostZoomLevels;
342
341 // Functions to add and remove observers for this object. 343 // Functions to add and remove observers for this object.
342 void AddObserver(RenderFrameObserver* observer); 344 void AddObserver(RenderFrameObserver* observer);
343 void RemoveObserver(RenderFrameObserver* observer); 345 void RemoveObserver(RenderFrameObserver* observer);
344 346
347 void UpdateURL(blink::WebFrame* frame);
348
345 // IPC message handlers ------------------------------------------------------ 349 // IPC message handlers ------------------------------------------------------
346 // 350 //
347 // The documentation for these functions should be in 351 // The documentation for these functions should be in
348 // content/common/*_messages.h for the message that the function is handling. 352 // content/common/*_messages.h for the message that the function is handling.
349 void OnSwapOut(); 353 void OnSwapOut();
350 void OnChildFrameProcessGone(); 354 void OnChildFrameProcessGone();
351 void OnBuffersSwapped(const FrameMsg_BuffersSwapped_Params& params); 355 void OnBuffersSwapped(const FrameMsg_BuffersSwapped_Params& params);
352 void OnCompositorFrameSwapped(const IPC::Message& message); 356 void OnCompositorFrameSwapped(const IPC::Message& message);
353 void OnShowContextMenu(const gfx::Point& location); 357 void OnShowContextMenu(const gfx::Point& location);
354 void OnContextMenuClosed(const CustomContextMenuContext& custom_context); 358 void OnContextMenuClosed(const CustomContextMenuContext& custom_context);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 // 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
397 // much about leaks. 401 // much about leaks.
398 IDMap<ContextMenuClient, IDMapExternalPointer> pending_context_menus_; 402 IDMap<ContextMenuClient, IDMapExternalPointer> pending_context_menus_;
399 403
400 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 404 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
401 }; 405 };
402 406
403 } // namespace content 407 } // namespace content
404 408
405 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 409 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698