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

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

Issue 2374863002: Remove usage of HostZoomMap from c/b/loader via ReadyToCommitNavigation (Closed)
Patch Set: try separate mojom for Associated, crashes on registration Created 4 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 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
11 #include <map> 11 #include <map>
12 #include <memory>
12 #include <set> 13 #include <set>
13 #include <string> 14 #include <string>
14 #include <vector> 15 #include <vector>
15 16
16 #include "base/callback.h" 17 #include "base/callback.h"
17 #include "base/compiler_specific.h" 18 #include "base/compiler_specific.h"
18 #include "base/gtest_prod_util.h" 19 #include "base/gtest_prod_util.h"
19 #include "base/macros.h" 20 #include "base/macros.h"
20 #include "base/memory/weak_ptr.h" 21 #include "base/memory/weak_ptr.h"
21 #include "base/strings/string16.h" 22 #include "base/strings/string16.h"
22 #include "base/time/time.h" 23 #include "base/time/time.h"
23 #include "build/build_config.h" 24 #include "build/build_config.h"
24 #include "content/browser/accessibility/browser_accessibility_manager.h" 25 #include "content/browser/accessibility/browser_accessibility_manager.h"
25 #include "content/browser/bad_message.h" 26 #include "content/browser/bad_message.h"
27 #include "content/browser/host_zoom_map_host.h"
26 #include "content/browser/loader/global_routing_id.h" 28 #include "content/browser/loader/global_routing_id.h"
27 #include "content/browser/site_instance_impl.h" 29 #include "content/browser/site_instance_impl.h"
28 #include "content/browser/webui/web_ui_impl.h" 30 #include "content/browser/webui/web_ui_impl.h"
29 #include "content/common/accessibility_mode_enums.h" 31 #include "content/common/accessibility_mode_enums.h"
30 #include "content/common/ax_content_node_data.h" 32 #include "content/common/ax_content_node_data.h"
31 #include "content/common/content_export.h" 33 #include "content/common/content_export.h"
32 #include "content/common/frame.mojom.h" 34 #include "content/common/frame.mojom.h"
33 #include "content/common/frame_message_enums.h" 35 #include "content/common/frame_message_enums.h"
34 #include "content/common/frame_replication_state.h" 36 #include "content/common/frame_replication_state.h"
35 #include "content/common/image_downloader/image_downloader.mojom.h" 37 #include "content/common/image_downloader/image_downloader.mojom.h"
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 1046
1045 // Callback for responding when 1047 // Callback for responding when
1046 // |FrameHostMsg_TextSurroundingSelectionResponse| message comes. 1048 // |FrameHostMsg_TextSurroundingSelectionResponse| message comes.
1047 TextSurroundingSelectionCallback text_surrounding_selection_callback_; 1049 TextSurroundingSelectionCallback text_surrounding_selection_callback_;
1048 1050
1049 std::vector<std::unique_ptr<shell::InterfaceRegistry>> media_registries_; 1051 std::vector<std::unique_ptr<shell::InterfaceRegistry>> media_registries_;
1050 1052
1051 std::unique_ptr<AssociatedInterfaceProviderImpl> 1053 std::unique_ptr<AssociatedInterfaceProviderImpl>
1052 remote_associated_interfaces_; 1054 remote_associated_interfaces_;
1053 1055
1056 std::unique_ptr<HostZoomMapHost> host_zoom_map_host_;
1057
1054 // NOTE: This must be the last member. 1058 // NOTE: This must be the last member.
1055 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1059 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1056 1060
1057 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1061 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1058 }; 1062 };
1059 1063
1060 } // namespace content 1064 } // namespace content
1061 1065
1062 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1066 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698