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

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

Issue 609393002: [Push] Use Manifest.gcm_sender_id instead of API sender_id if possible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@manifest_gcm_sender_id
Patch Set: review 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 999
1000 // In case LoadRequest failed before DidCreateDataSource was called. 1000 // In case LoadRequest failed before DidCreateDataSource was called.
1001 render_view_->pending_navigation_params_.reset(); 1001 render_view_->pending_navigation_params_.reset();
1002 } 1002 }
1003 1003
1004 void RenderFrameImpl::BindServiceRegistry( 1004 void RenderFrameImpl::BindServiceRegistry(
1005 mojo::ScopedMessagePipeHandle service_provider_handle) { 1005 mojo::ScopedMessagePipeHandle service_provider_handle) {
1006 service_registry_.BindRemoteServiceProvider(service_provider_handle.Pass()); 1006 service_registry_.BindRemoteServiceProvider(service_provider_handle.Pass());
1007 } 1007 }
1008 1008
1009 ManifestManager* RenderFrameImpl::manifest_manager() {
1010 return manifest_manager_;
1011 }
1012
1009 void RenderFrameImpl::OnBeforeUnload() { 1013 void RenderFrameImpl::OnBeforeUnload() {
1010 TRACE_EVENT1("navigation", "RenderFrameImpl::OnBeforeUnload", 1014 TRACE_EVENT1("navigation", "RenderFrameImpl::OnBeforeUnload",
1011 "id", routing_id_); 1015 "id", routing_id_);
1012 // TODO(creis): Right now, this is only called on the main frame. Make the 1016 // TODO(creis): Right now, this is only called on the main frame. Make the
1013 // browser process send dispatchBeforeUnloadEvent to every frame that needs 1017 // browser process send dispatchBeforeUnloadEvent to every frame that needs
1014 // it. 1018 // it.
1015 CHECK(!frame_->parent()); 1019 CHECK(!frame_->parent());
1016 1020
1017 base::TimeTicks before_unload_start_time = base::TimeTicks::Now(); 1021 base::TimeTicks before_unload_start_time = base::TimeTicks::Now();
1018 bool proceed = frame_->dispatchBeforeUnloadEvent(); 1022 bool proceed = frame_->dispatchBeforeUnloadEvent();
(...skipping 2883 matching lines...) Expand 10 before | Expand all | Expand 10 after
3902 3906
3903 #if defined(ENABLE_BROWSER_CDMS) 3907 #if defined(ENABLE_BROWSER_CDMS)
3904 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3908 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3905 if (!cdm_manager_) 3909 if (!cdm_manager_)
3906 cdm_manager_ = new RendererCdmManager(this); 3910 cdm_manager_ = new RendererCdmManager(this);
3907 return cdm_manager_; 3911 return cdm_manager_;
3908 } 3912 }
3909 #endif // defined(ENABLE_BROWSER_CDMS) 3913 #endif // defined(ENABLE_BROWSER_CDMS)
3910 3914
3911 } // namespace content 3915 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698