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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 2921823002: Rationalize WakeLock naming conventions (Closed)
Patch Set: rebase Created 3 years, 6 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 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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 const service_manager::BindSourceInfo& source_info, 913 const service_manager::BindSourceInfo& source_info,
914 mojom::RendererAudioOutputStreamFactoryRequest request); 914 mojom::RendererAudioOutputStreamFactoryRequest request);
915 915
916 void BindMediaInterfaceFactoryRequest( 916 void BindMediaInterfaceFactoryRequest(
917 const service_manager::BindSourceInfo& source_info, 917 const service_manager::BindSourceInfo& source_info,
918 media::mojom::InterfaceFactoryRequest request); 918 media::mojom::InterfaceFactoryRequest request);
919 919
920 // Callback for connection error on the media::mojom::InterfaceFactory client. 920 // Callback for connection error on the media::mojom::InterfaceFactory client.
921 void OnMediaInterfaceFactoryConnectionError(); 921 void OnMediaInterfaceFactoryConnectionError();
922 922
923 void BindWakeLockServiceRequest( 923 void BindWakeLockRequest(const service_manager::BindSourceInfo& source_info,
924 const service_manager::BindSourceInfo& source_info, 924 device::mojom::WakeLockRequest request);
925 device::mojom::WakeLockServiceRequest request);
926 925
927 #if defined(OS_ANDROID) 926 #if defined(OS_ANDROID)
928 void BindNFCRequest(const service_manager::BindSourceInfo& source_info, 927 void BindNFCRequest(const service_manager::BindSourceInfo& source_info,
929 device::mojom::NFCRequest request); 928 device::mojom::NFCRequest request);
930 #endif 929 #endif
931 930
932 // service_manager::mojom::InterfaceProvider: 931 // service_manager::mojom::InterfaceProvider:
933 void GetInterface(const std::string& interface_name, 932 void GetInterface(const std::string& interface_name,
934 mojo::ScopedMessagePipeHandle interface_pipe) override; 933 mojo::ScopedMessagePipeHandle interface_pipe) override;
935 934
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 1247
1249 // NOTE: This must be the last member. 1248 // NOTE: This must be the last member.
1250 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1249 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1251 1250
1252 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1251 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1253 }; 1252 };
1254 1253
1255 } // namespace content 1254 } // namespace content
1256 1255
1257 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1256 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_delegate.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698