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

Side by Side Diff: components/html_viewer/html_frame.h

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content_unittests compile fix Created 5 years, 1 month 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 | « no previous file | components/html_viewer/html_frame.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 blink::WebLocalFrame* frame, 159 blink::WebLocalFrame* frame,
160 const blink::WebURL& url, 160 const blink::WebURL& url,
161 blink::WebMediaPlayerClient* client, 161 blink::WebMediaPlayerClient* client,
162 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 162 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
163 blink::WebContentDecryptionModule* initial_cdm, 163 blink::WebContentDecryptionModule* initial_cdm,
164 const blink::WebString& sink_id); 164 const blink::WebString& sink_id);
165 virtual blink::WebFrame* createChildFrame( 165 virtual blink::WebFrame* createChildFrame(
166 blink::WebLocalFrame* parent, 166 blink::WebLocalFrame* parent,
167 blink::WebTreeScopeType scope, 167 blink::WebTreeScopeType scope,
168 const blink::WebString& frame_ame, 168 const blink::WebString& frame_ame,
169 blink::WebSandboxFlags sandbox_flags); 169 blink::WebSandboxFlags sandbox_flags,
170 const blink::WebFrameOwnerProperties& frame_owner_properties);
170 virtual void frameDetached(blink::WebFrame* frame, 171 virtual void frameDetached(blink::WebFrame* frame,
171 blink::WebFrameClient::DetachType type); 172 blink::WebFrameClient::DetachType type);
172 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); 173 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
173 virtual blink::WebNavigationPolicy decidePolicyForNavigation( 174 virtual blink::WebNavigationPolicy decidePolicyForNavigation(
174 const NavigationPolicyInfo& info); 175 const NavigationPolicyInfo& info);
175 virtual bool hasPendingNavigation(blink::WebLocalFrame* frame); 176 virtual bool hasPendingNavigation(blink::WebLocalFrame* frame);
176 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame); 177 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame);
177 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, 178 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
178 const blink::WebString& source_name, 179 const blink::WebString& source_name,
179 unsigned source_line, 180 unsigned source_line,
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 base::TimeTicks navigation_start_time_; 370 base::TimeTicks navigation_start_time_;
370 371
371 base::WeakPtrFactory<HTMLFrame> weak_factory_; 372 base::WeakPtrFactory<HTMLFrame> weak_factory_;
372 373
373 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); 374 DISALLOW_COPY_AND_ASSIGN(HTMLFrame);
374 }; 375 };
375 376
376 } // namespace html_viewer 377 } // namespace html_viewer
377 378
378 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 379 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/html_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698