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

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

Issue 1149793002: Detach old frame on WebFrame::swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: renaming enum Created 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_DOCUMENT_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 blink::WebLocalFrame* frame, 92 blink::WebLocalFrame* frame,
93 const blink::WebURL& url, 93 const blink::WebURL& url,
94 blink::WebMediaPlayerClient* client, 94 blink::WebMediaPlayerClient* client,
95 blink::WebContentDecryptionModule* initial_cdm); 95 blink::WebContentDecryptionModule* initial_cdm);
96 virtual blink::WebFrame* createChildFrame( 96 virtual blink::WebFrame* createChildFrame(
97 blink::WebLocalFrame* parent, 97 blink::WebLocalFrame* parent,
98 blink::WebTreeScopeType scope, 98 blink::WebTreeScopeType scope,
99 const blink::WebString& frameName, 99 const blink::WebString& frameName,
100 blink::WebSandboxFlags sandboxFlags); 100 blink::WebSandboxFlags sandboxFlags);
101 virtual void frameDetached(blink::WebFrame*); 101 virtual void frameDetached(blink::WebFrame*);
102 virtual void frameDetached(blink::WebFrame*,
103 blink::WebFrameClient::DetachType);
dcheng 2015/06/01 21:15:54 You shouldn't need any qualifiers for DetachType h
lfg 2015/06/01 21:34:19 Done.
102 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); 104 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
103 virtual blink::WebNavigationPolicy decidePolicyForNavigation( 105 virtual blink::WebNavigationPolicy decidePolicyForNavigation(
104 const NavigationPolicyInfo& info); 106 const NavigationPolicyInfo& info);
105 107
106 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, 108 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
107 const blink::WebString& source_name, 109 const blink::WebString& source_name,
108 unsigned source_line, 110 unsigned source_line,
109 const blink::WebString& stack_trace); 111 const blink::WebString& stack_trace);
110 virtual void didFinishLoad(blink::WebLocalFrame* frame); 112 virtual void didFinishLoad(blink::WebLocalFrame* frame);
111 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, 113 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 Setup* setup_; 169 Setup* setup_;
168 170
169 scoped_ptr<TouchHandler> touch_handler_; 171 scoped_ptr<TouchHandler> touch_handler_;
170 172
171 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); 173 DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
172 }; 174 };
173 175
174 } // namespace html_viewer 176 } // namespace html_viewer
175 177
176 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_ 178 #endif // COMPONENTS_HTML_VIEWER_HTML_DOCUMENT_H_
OLDNEW
« no previous file with comments | « no previous file | components/html_viewer/html_document.cc » ('j') | components/html_viewer/html_document.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698