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

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

Issue 2918903002: Move IconURLs method from WebFrame to WebLocalFrame (Closed)
Patch Set: s/kFavIcon/kFavicon/g (as suggested in CR feedback from pkotwicz@). 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
« no previous file with comments | « content/public/common/favicon_url.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | 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 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "third_party/WebKit/public/platform/WebLoadingBehaviorFlag.h" 68 #include "third_party/WebKit/public/platform/WebLoadingBehaviorFlag.h"
69 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 69 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
70 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h" 70 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
71 #include "third_party/WebKit/public/platform/site_engagement.mojom.h" 71 #include "third_party/WebKit/public/platform/site_engagement.mojom.h"
72 #include "third_party/WebKit/public/web/WebAXObject.h" 72 #include "third_party/WebKit/public/web/WebAXObject.h"
73 #include "third_party/WebKit/public/web/WebDataSource.h" 73 #include "third_party/WebKit/public/web/WebDataSource.h"
74 #include "third_party/WebKit/public/web/WebFrameClient.h" 74 #include "third_party/WebKit/public/web/WebFrameClient.h"
75 #include "third_party/WebKit/public/web/WebFrameLoadType.h" 75 #include "third_party/WebKit/public/web/WebFrameLoadType.h"
76 #include "third_party/WebKit/public/web/WebFrameSerializerClient.h" 76 #include "third_party/WebKit/public/web/WebFrameSerializerClient.h"
77 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" 77 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
78 #include "third_party/WebKit/public/web/WebIconURL.h"
78 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h" 79 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h"
79 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h" 80 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
80 #include "ui/gfx/range/range.h" 81 #include "ui/gfx/range/range.h"
81 #include "url/gurl.h" 82 #include "url/gurl.h"
82 #include "url/origin.h" 83 #include "url/origin.h"
83 84
84 #if BUILDFLAG(ENABLE_PLUGINS) 85 #if BUILDFLAG(ENABLE_PLUGINS)
85 #include "content/renderer/pepper/plugin_power_saver_helper.h" 86 #include "content/renderer/pepper/plugin_power_saver_helper.h"
86 #endif 87 #endif
87 88
(...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after
1109 void GetInterface(const std::string& interface_name, 1110 void GetInterface(const std::string& interface_name,
1110 mojo::ScopedMessagePipeHandle interface_pipe) override; 1111 mojo::ScopedMessagePipeHandle interface_pipe) override;
1111 1112
1112 // Send |callback| our AndroidOverlay routing token when it arrives. We may 1113 // Send |callback| our AndroidOverlay routing token when it arrives. We may
1113 // call |callback| before returning. 1114 // call |callback| before returning.
1114 void RequestOverlayRoutingToken(media::RoutingTokenCallback callback); 1115 void RequestOverlayRoutingToken(media::RoutingTokenCallback callback);
1115 1116
1116 // Ask the host to send our AndroidOverlay routing token to us. 1117 // Ask the host to send our AndroidOverlay routing token to us.
1117 void RequestOverlayRoutingTokenFromHost(); 1118 void RequestOverlayRoutingTokenFromHost();
1118 1119
1120 void SendUpdateFaviconURL(blink::WebIconURL::Type icon_types_mask);
1121
1119 // Stores the WebLocalFrame we are associated with. This is null from the 1122 // Stores the WebLocalFrame we are associated with. This is null from the
1120 // constructor until BindToWebFrame is called, and it is null after 1123 // constructor until BindToWebFrame is called, and it is null after
1121 // frameDetached is called until destruction (which is asynchronous in the 1124 // frameDetached is called until destruction (which is asynchronous in the
1122 // case of the main frame, but not subframes). 1125 // case of the main frame, but not subframes).
1123 blink::WebLocalFrame* frame_; 1126 blink::WebLocalFrame* frame_;
1124 1127
1125 // Boolean value indicating whether this RenderFrameImpl object is for the 1128 // Boolean value indicating whether this RenderFrameImpl object is for the
1126 // main frame or not. It remains accurate during destruction, even when 1129 // main frame or not. It remains accurate during destruction, even when
1127 // |frame_| has been invalidated. 1130 // |frame_| has been invalidated.
1128 bool is_main_frame_; 1131 bool is_main_frame_;
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1418 std::vector<media::RoutingTokenCallback> pending_routing_token_callbacks_; 1421 std::vector<media::RoutingTokenCallback> pending_routing_token_callbacks_;
1419 1422
1420 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1423 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1421 1424
1422 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1425 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1423 }; 1426 };
1424 1427
1425 } // namespace content 1428 } // namespace content
1426 1429
1427 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1430 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/common/favicon_url.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698