OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 media::MessageLoopFactory* message_loop_factory, | 80 media::MessageLoopFactory* message_loop_factory, |
81 webkit_media::MediaStreamClient* media_stream_client, | 81 webkit_media::MediaStreamClient* media_stream_client, |
82 media::MediaLog* media_log) OVERRIDE; | 82 media::MediaLog* media_log) OVERRIDE; |
83 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; | 83 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; |
84 virtual bool AllowPopup(const GURL& creator) OVERRIDE; | 84 virtual bool AllowPopup(const GURL& creator) OVERRIDE; |
85 virtual bool ShouldFork(WebKit::WebFrame* frame, | 85 virtual bool ShouldFork(WebKit::WebFrame* frame, |
86 const GURL& url, | 86 const GURL& url, |
87 bool is_initial_navigation, | 87 bool is_initial_navigation, |
88 bool* send_referrer) OVERRIDE; | 88 bool* send_referrer) OVERRIDE; |
89 virtual bool WillSendRequest(WebKit::WebFrame* frame, | 89 virtual bool WillSendRequest(WebKit::WebFrame* frame, |
| 90 content::PageTransition transition_type, |
90 const GURL& url, | 91 const GURL& url, |
91 GURL* new_url) OVERRIDE; | 92 GURL* new_url) OVERRIDE; |
92 virtual bool ShouldPumpEventsDuringCookieMessage() OVERRIDE; | 93 virtual bool ShouldPumpEventsDuringCookieMessage() OVERRIDE; |
93 virtual void DidCreateScriptContext(WebKit::WebFrame* frame, | 94 virtual void DidCreateScriptContext(WebKit::WebFrame* frame, |
94 v8::Handle<v8::Context> context, | 95 v8::Handle<v8::Context> context, |
95 int extension_group, | 96 int extension_group, |
96 int world_id) OVERRIDE; | 97 int world_id) OVERRIDE; |
97 virtual void WillReleaseScriptContext(WebKit::WebFrame* frame, | 98 virtual void WillReleaseScriptContext(WebKit::WebFrame* frame, |
98 v8::Handle<v8::Context> context, | 99 v8::Handle<v8::Context> context, |
99 int world_id) OVERRIDE; | 100 int world_id) OVERRIDE; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 scoped_ptr<RendererNetPredictor> net_predictor_; | 167 scoped_ptr<RendererNetPredictor> net_predictor_; |
167 scoped_ptr<SpellCheck> spellcheck_; | 168 scoped_ptr<SpellCheck> spellcheck_; |
168 scoped_ptr<VisitedLinkSlave> visited_link_slave_; | 169 scoped_ptr<VisitedLinkSlave> visited_link_slave_; |
169 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; | 170 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; |
170 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; | 171 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; |
171 }; | 172 }; |
172 | 173 |
173 } // namespace chrome | 174 } // namespace chrome |
174 | 175 |
175 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 176 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
OLD | NEW |