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

Side by Side Diff: chrome/browser/renderer_host/mock_render_process_host.h

Issue 164071: Merge 22540 - Ensure that we never call into WebCore::Page static methods whe... (Closed) Base URL: svn://chrome-svn/chrome/branches/197/src/
Patch Set: Created 11 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 | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/browser/renderer_host/mock_render_process_host.h:r22540
Merged /branches/chrome_webkit_merge_branch/chrome/browser/renderer_host/mock_render_process_host.h:r69-2775
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 CHROME_BROWSER_RENDERER_HOST_MOCK_RENDER_PROCESS_HOST_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_MOCK_RENDER_PROCESS_HOST_H_
6 #define CHROME_BROWSER_RENDERER_HOST_MOCK_RENDER_PROCESS_HOST_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_MOCK_RENDER_PROCESS_HOST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "chrome/browser/renderer_host/render_process_host.h" 9 #include "chrome/browser/renderer_host/render_process_host.h"
10 #include "chrome/common/ipc_test_sink.h" 10 #include "chrome/common/ipc_test_sink.h"
(...skipping 22 matching lines...) Expand all
33 virtual bool Init(); 33 virtual bool Init();
34 virtual int GetNextRoutingID(); 34 virtual int GetNextRoutingID();
35 virtual void CancelResourceRequests(int render_widget_id); 35 virtual void CancelResourceRequests(int render_widget_id);
36 virtual void CrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params); 36 virtual void CrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
37 virtual bool WaitForPaintMsg(int render_widget_id, 37 virtual bool WaitForPaintMsg(int render_widget_id,
38 const base::TimeDelta& max_delay, 38 const base::TimeDelta& max_delay,
39 IPC::Message* msg); 39 IPC::Message* msg);
40 virtual void ReceivedBadMessage(uint16 msg_type); 40 virtual void ReceivedBadMessage(uint16 msg_type);
41 virtual void WidgetRestored(); 41 virtual void WidgetRestored();
42 virtual void WidgetHidden(); 42 virtual void WidgetHidden();
43 virtual void ViewCreated();
43 virtual void AddWord(const std::wstring& word); 44 virtual void AddWord(const std::wstring& word);
44 virtual void AddVisitedLinks( 45 virtual void AddVisitedLinks(
45 const VisitedLinkCommon::Fingerprints& visited_links); 46 const VisitedLinkCommon::Fingerprints& visited_links);
46 virtual void ResetVisitedLinks(); 47 virtual void ResetVisitedLinks();
47 virtual bool FastShutdownIfPossible(); 48 virtual bool FastShutdownIfPossible();
48 virtual bool SendWithTimeout(IPC::Message* msg, int timeout_ms); 49 virtual bool SendWithTimeout(IPC::Message* msg, int timeout_ms);
49 virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id); 50 virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id);
50 51
51 // IPC::Channel::Sender via RenderProcessHost. 52 // IPC::Channel::Sender via RenderProcessHost.
52 virtual bool Send(IPC::Message* msg); 53 virtual bool Send(IPC::Message* msg);
(...skipping 19 matching lines...) Expand all
72 virtual RenderProcessHost* CreateRenderProcessHost( 73 virtual RenderProcessHost* CreateRenderProcessHost(
73 Profile* profile) const { 74 Profile* profile) const {
74 return new MockRenderProcessHost(profile); 75 return new MockRenderProcessHost(profile);
75 } 76 }
76 77
77 private: 78 private:
78 DISALLOW_COPY_AND_ASSIGN(MockRenderProcessHostFactory); 79 DISALLOW_COPY_AND_ASSIGN(MockRenderProcessHostFactory);
79 }; 80 };
80 81
81 #endif // CHROME_BROWSER_RENDERER_HOST_MOCK_RENDER_PROCESS_HOST_H_ 82 #endif // CHROME_BROWSER_RENDERER_HOST_MOCK_RENDER_PROCESS_HOST_H_
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/browser_render_process_host.cc ('k') | chrome/browser/renderer_host/mock_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698