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

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

Issue 2865653002: [Device Service] Decouple NFC implementation from //content (Closed)
Patch Set: Response to review + fix for tests that don't actually run on bots Created 3 years, 7 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 26 matching lines...) Expand all
37 #include "content/common/download/mhtml_save_status.h" 37 #include "content/common/download/mhtml_save_status.h"
38 #include "content/common/features.h" 38 #include "content/common/features.h"
39 #include "content/common/frame.mojom.h" 39 #include "content/common/frame.mojom.h"
40 #include "content/common/frame_message_enums.h" 40 #include "content/common/frame_message_enums.h"
41 #include "content/common/frame_replication_state.h" 41 #include "content/common/frame_replication_state.h"
42 #include "content/common/image_downloader/image_downloader.mojom.h" 42 #include "content/common/image_downloader/image_downloader.mojom.h"
43 #include "content/common/navigation_params.h" 43 #include "content/common/navigation_params.h"
44 #include "content/public/browser/render_frame_host.h" 44 #include "content/public/browser/render_frame_host.h"
45 #include "content/public/common/javascript_dialog_type.h" 45 #include "content/public/common/javascript_dialog_type.h"
46 #include "content/public/common/previews_state.h" 46 #include "content/public/common/previews_state.h"
47 #include "device/nfc/nfc.mojom.h"
47 #include "device/wake_lock/public/interfaces/wake_lock_context.mojom.h" 48 #include "device/wake_lock/public/interfaces/wake_lock_context.mojom.h"
48 #include "media/mojo/interfaces/interface_factory.mojom.h" 49 #include "media/mojo/interfaces/interface_factory.mojom.h"
49 #include "mojo/public/cpp/bindings/binding_set.h" 50 #include "mojo/public/cpp/bindings/binding_set.h"
50 #include "mojo/public/cpp/system/data_pipe.h" 51 #include "mojo/public/cpp/system/data_pipe.h"
51 #include "net/http/http_response_headers.h" 52 #include "net/http/http_response_headers.h"
52 #include "third_party/WebKit/public/platform/WebFocusType.h" 53 #include "third_party/WebKit/public/platform/WebFocusType.h"
53 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h" 54 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
54 #include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.moj om.h" 55 #include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.moj om.h"
55 #include "third_party/WebKit/public/web/WebTextDirection.h" 56 #include "third_party/WebKit/public/web/WebTextDirection.h"
56 #include "third_party/WebKit/public/web/WebTreeScopeType.h" 57 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 const service_manager::BindSourceInfo& source_info, 911 const service_manager::BindSourceInfo& source_info,
911 media::mojom::InterfaceFactoryRequest request); 912 media::mojom::InterfaceFactoryRequest request);
912 913
913 // Callback for connection error on the media::mojom::InterfaceFactory client. 914 // Callback for connection error on the media::mojom::InterfaceFactory client.
914 void OnMediaInterfaceFactoryConnectionError(); 915 void OnMediaInterfaceFactoryConnectionError();
915 916
916 void BindWakeLockServiceRequest( 917 void BindWakeLockServiceRequest(
917 const service_manager::BindSourceInfo& source_info, 918 const service_manager::BindSourceInfo& source_info,
918 device::mojom::WakeLockServiceRequest request); 919 device::mojom::WakeLockServiceRequest request);
919 920
921 void BindNFCRequest(const service_manager::BindSourceInfo& source_info,
922 device::nfc::mojom::NFCRequest request);
923
920 // service_manager::mojom::InterfaceProvider: 924 // service_manager::mojom::InterfaceProvider:
921 void GetInterface(const std::string& interface_name, 925 void GetInterface(const std::string& interface_name,
922 mojo::ScopedMessagePipeHandle interface_pipe) override; 926 mojo::ScopedMessagePipeHandle interface_pipe) override;
923 927
924 // Allows tests to disable the swapout event timer to simulate bugs that 928 // Allows tests to disable the swapout event timer to simulate bugs that
925 // happen before it fires (to avoid flakiness). 929 // happen before it fires (to avoid flakiness).
926 void DisableSwapOutTimerForTesting(); 930 void DisableSwapOutTimerForTesting();
927 931
928 void OnRendererConnect(const service_manager::BindSourceInfo& local_info, 932 void OnRendererConnect(const service_manager::BindSourceInfo& local_info,
929 const service_manager::BindSourceInfo& remote_info); 933 const service_manager::BindSourceInfo& remote_info);
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 1222
1219 // NOTE: This must be the last member. 1223 // NOTE: This must be the last member.
1220 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1224 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1221 1225
1222 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1226 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1223 }; 1227 };
1224 1228
1225 } // namespace content 1229 } // namespace content
1226 1230
1227 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1231 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698