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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 media::MessageLoopFactory* message_loop_factory, | 83 media::MessageLoopFactory* message_loop_factory, |
84 webkit_media::MediaStreamClient* media_stream_client, | 84 webkit_media::MediaStreamClient* media_stream_client, |
85 media::MediaLog* media_log) OVERRIDE; | 85 media::MediaLog* media_log) OVERRIDE; |
86 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; | 86 virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE; |
87 virtual bool AllowPopup(const GURL& creator) OVERRIDE; | 87 virtual bool AllowPopup(const GURL& creator) OVERRIDE; |
88 virtual bool ShouldFork(WebKit::WebFrame* frame, | 88 virtual bool ShouldFork(WebKit::WebFrame* frame, |
89 const GURL& url, | 89 const GURL& url, |
90 bool is_initial_navigation, | 90 bool is_initial_navigation, |
91 bool* send_referrer) OVERRIDE; | 91 bool* send_referrer) OVERRIDE; |
92 virtual bool WillSendRequest(WebKit::WebFrame* frame, | 92 virtual bool WillSendRequest(WebKit::WebFrame* frame, |
| 93 content::PageTransition transition_type, |
93 const GURL& url, | 94 const GURL& url, |
94 GURL* new_url) OVERRIDE; | 95 GURL* new_url) OVERRIDE; |
95 virtual bool ShouldPumpEventsDuringCookieMessage() OVERRIDE; | 96 virtual bool ShouldPumpEventsDuringCookieMessage() OVERRIDE; |
96 virtual void DidCreateScriptContext(WebKit::WebFrame* frame, | 97 virtual void DidCreateScriptContext(WebKit::WebFrame* frame, |
97 v8::Handle<v8::Context> context, | 98 v8::Handle<v8::Context> context, |
98 int extension_group, | 99 int extension_group, |
99 int world_id) OVERRIDE; | 100 int world_id) OVERRIDE; |
100 virtual void WillReleaseScriptContext(WebKit::WebFrame* frame, | 101 virtual void WillReleaseScriptContext(WebKit::WebFrame* frame, |
101 v8::Handle<v8::Context> context, | 102 v8::Handle<v8::Context> context, |
102 int world_id) OVERRIDE; | 103 int world_id) OVERRIDE; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 scoped_ptr<RendererNetPredictor> net_predictor_; | 170 scoped_ptr<RendererNetPredictor> net_predictor_; |
170 scoped_ptr<SpellCheck> spellcheck_; | 171 scoped_ptr<SpellCheck> spellcheck_; |
171 scoped_ptr<VisitedLinkSlave> visited_link_slave_; | 172 scoped_ptr<VisitedLinkSlave> visited_link_slave_; |
172 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; | 173 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; |
173 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; | 174 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; |
174 }; | 175 }; |
175 | 176 |
176 } // namespace chrome | 177 } // namespace chrome |
177 | 178 |
178 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 179 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
OLD | NEW |