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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.h

Issue 665923002: Moves RenderProcessHostImpl::init_time() to RenderProcessHost to fix broken test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed CR comments. Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <string> 10 #include <string>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 base::Callback<void(const std::string&)> callback) override; 132 base::Callback<void(const std::string&)> callback) override;
133 virtual WebRtcStopRtpDumpCallback StartRtpDump( 133 virtual WebRtcStopRtpDumpCallback StartRtpDump(
134 bool incoming, 134 bool incoming,
135 bool outgoing, 135 bool outgoing,
136 const WebRtcRtpPacketCallback& packet_callback) override; 136 const WebRtcRtpPacketCallback& packet_callback) override;
137 #endif 137 #endif
138 virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id) 138 virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id)
139 override; 139 override;
140 virtual void NotifyTimezoneChange() override; 140 virtual void NotifyTimezoneChange() override;
141 virtual ServiceRegistry* GetServiceRegistry() override; 141 virtual ServiceRegistry* GetServiceRegistry() override;
142 virtual const base::TimeTicks& GetInitTime() const override;
143
nasko 2014/10/20 19:53:57 nit: No need for extra empty line here.
carlosk 2014/10/21 12:23:54 Done.
142 144
143 // IPC::Sender via RenderProcessHost. 145 // IPC::Sender via RenderProcessHost.
144 virtual bool Send(IPC::Message* msg) override; 146 virtual bool Send(IPC::Message* msg) override;
145 147
146 // IPC::Listener via RenderProcessHost. 148 // IPC::Listener via RenderProcessHost.
147 virtual bool OnMessageReceived(const IPC::Message& msg) override; 149 virtual bool OnMessageReceived(const IPC::Message& msg) override;
148 virtual void OnChannelConnected(int32 peer_pid) override; 150 virtual void OnChannelConnected(int32 peer_pid) override;
149 virtual void OnChannelError() override; 151 virtual void OnChannelError() override;
150 virtual void OnBadMessageReceived(const IPC::Message& message) override; 152 virtual void OnBadMessageReceived(const IPC::Message& message) override;
151 153
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // Called when the existence of the other renderer process which is connected 251 // Called when the existence of the other renderer process which is connected
250 // to the Worker in this renderer process has changed. 252 // to the Worker in this renderer process has changed.
251 // It is only called when "enable-embedded-shared-worker" flag is set. 253 // It is only called when "enable-embedded-shared-worker" flag is set.
252 void IncrementWorkerRefCount(); 254 void IncrementWorkerRefCount();
253 void DecrementWorkerRefCount(); 255 void DecrementWorkerRefCount();
254 256
255 // Call this function to resume the navigation when it was deferred 257 // Call this function to resume the navigation when it was deferred
256 // immediately after receiving response headers. 258 // immediately after receiving response headers.
257 void ResumeResponseDeferredAtStart(const GlobalRequestID& request_id); 259 void ResumeResponseDeferredAtStart(const GlobalRequestID& request_id);
258 260
259 // PlzNavigate
260 // Returns the time the first call to Init completed successfully (after a new
261 // renderer process was created); further calls to Init won't change this
262 // value.
263 // Note: Will disappear after PlzNavitate is completed.
264 const base::TimeTicks& init_time() const { return init_time_; }
265
266 protected: 261 protected:
267 // A proxy for our IPC::Channel that lives on the IO thread (see 262 // A proxy for our IPC::Channel that lives on the IO thread (see
268 // browser_process.h) 263 // browser_process.h)
269 scoped_ptr<IPC::ChannelProxy> channel_; 264 scoped_ptr<IPC::ChannelProxy> channel_;
270 265
271 // A host object ChannelMojo needs. The lifetime is bound to 266 // A host object ChannelMojo needs. The lifetime is bound to
272 // the RenderProcessHostImpl, not the channel. 267 // the RenderProcessHostImpl, not the channel.
273 scoped_ptr<IPC::ChannelMojoHost> channel_mojo_host_; 268 scoped_ptr<IPC::ChannelMojoHost> channel_mojo_host_;
274 269
275 // True if fast shutdown has been performed on this RPH. 270 // True if fast shutdown has been performed on this RPH.
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 base::TimeTicks survive_for_worker_start_time_; 457 base::TimeTicks survive_for_worker_start_time_;
463 458
464 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_; 459 base::WeakPtrFactory<RenderProcessHostImpl> weak_factory_;
465 460
466 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl); 461 DISALLOW_COPY_AND_ASSIGN(RenderProcessHostImpl);
467 }; 462 };
468 463
469 } // namespace content 464 } // namespace content
470 465
471 #endif // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_ 466 #endif // CONTENT_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698