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

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

Issue 160229: Merge 21531 - Fix a race condition where rapid back/forward clicks could clos... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/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:r21531
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 15 matching lines...) Expand all
26 // Provides tests access to the max page ID currently used for this process. 26 // Provides tests access to the max page ID currently used for this process.
27 int max_page_id() const { return max_page_id_; } 27 int max_page_id() const { return max_page_id_; }
28 28
29 // Provides test access to how many times a bad message has been received. 29 // Provides test access to how many times a bad message has been received.
30 int bad_msg_count() const { return bad_msg_count_; } 30 int bad_msg_count() const { return bad_msg_count_; }
31 31
32 // RenderProcessHost implementation (public portion). 32 // RenderProcessHost implementation (public portion).
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(int new_render_process_host_id, 36 virtual void CrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
37 int new_request_id);
38 virtual bool WaitForPaintMsg(int render_widget_id, 37 virtual bool WaitForPaintMsg(int render_widget_id,
39 const base::TimeDelta& max_delay, 38 const base::TimeDelta& max_delay,
40 IPC::Message* msg); 39 IPC::Message* msg);
41 virtual void ReceivedBadMessage(uint16 msg_type); 40 virtual void ReceivedBadMessage(uint16 msg_type);
42 virtual void WidgetRestored(); 41 virtual void WidgetRestored();
43 virtual void WidgetHidden(); 42 virtual void WidgetHidden();
44 virtual void AddWord(const std::wstring& word); 43 virtual void AddWord(const std::wstring& word);
45 virtual void AddVisitedLinks( 44 virtual void AddVisitedLinks(
46 const VisitedLinkCommon::Fingerprints& visited_links); 45 const VisitedLinkCommon::Fingerprints& visited_links);
47 virtual void ResetVisitedLinks(); 46 virtual void ResetVisitedLinks();
(...skipping 25 matching lines...) Expand all
73 virtual RenderProcessHost* CreateRenderProcessHost( 72 virtual RenderProcessHost* CreateRenderProcessHost(
74 Profile* profile) const { 73 Profile* profile) const {
75 return new MockRenderProcessHost(profile); 74 return new MockRenderProcessHost(profile);
76 } 75 }
77 76
78 private: 77 private:
79 DISALLOW_COPY_AND_ASSIGN(MockRenderProcessHostFactory); 78 DISALLOW_COPY_AND_ASSIGN(MockRenderProcessHostFactory);
80 }; 79 };
81 80
82 #endif // CHROME_BROWSER_RENDERER_HOST_MOCK_RENDER_PROCESS_HOST_H_ 81 #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