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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 10951029: Removes PluginInfoMessageFilter dependency on PluginGroup. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict Created 8 years, 3 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 | « chrome/common/render_messages.h ('k') | chrome/renderer/chrome_content_renderer_client.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 (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
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "content/public/renderer/content_renderer_client.h" 14 #include "content/public/renderer/content_renderer_client.h"
15 15
16 class ChromeRenderProcessObserver; 16 class ChromeRenderProcessObserver;
17 class ExtensionSet; 17 class ExtensionSet;
18 class RendererNetPredictor; 18 class RendererNetPredictor;
19 class SpellCheck; 19 class SpellCheck;
20 class SpellCheckProvider; 20 class SpellCheckProvider;
21 class VisitedLinkSlave; 21 class VisitedLinkSlave;
22 22
23 struct ChromeViewHostMsg_GetPluginInfo_Status; 23 struct ChromeViewHostMsg_GetPluginInfo_Output;
24 24
25 namespace extensions { 25 namespace extensions {
26 class Dispatcher; 26 class Dispatcher;
27 } 27 }
28 28
29 namespace media { 29 namespace media {
30 class AudioRendererSink; 30 class AudioRendererSink;
31 } 31 }
32 32
33 namespace prerender { 33 namespace prerender {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 virtual void RegisterPPAPIInterfaceFactories( 135 virtual void RegisterPPAPIInterfaceFactories(
136 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) OVERRIDE; 136 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) OVERRIDE;
137 137
138 SpellCheck* spellcheck() const { return spellcheck_.get(); } 138 SpellCheck* spellcheck() const { return spellcheck_.get(); }
139 139
140 WebKit::WebPlugin* CreatePlugin( 140 WebKit::WebPlugin* CreatePlugin(
141 content::RenderView* render_view, 141 content::RenderView* render_view,
142 WebKit::WebFrame* frame, 142 WebKit::WebFrame* frame,
143 const WebKit::WebPluginParams& params, 143 const WebKit::WebPluginParams& params,
144 const ChromeViewHostMsg_GetPluginInfo_Status& status, 144 const ChromeViewHostMsg_GetPluginInfo_Output& output);
145 const webkit::WebPluginInfo& plugin,
146 const std::string& actual_mime_type);
147 145
148 private: 146 private:
149 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); 147 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
150 148
151 // Returns true if the frame is navigating to an URL either into or out of an 149 // Returns true if the frame is navigating to an URL either into or out of an
152 // extension app's extent. 150 // extension app's extent.
153 bool CrossesExtensionExtents(WebKit::WebFrame* frame, 151 bool CrossesExtensionExtents(WebKit::WebFrame* frame,
154 const GURL& new_url, 152 const GURL& new_url,
155 const ExtensionSet& extensions, 153 const ExtensionSet& extensions,
156 bool is_extension_url, 154 bool is_extension_url,
(...skipping 13 matching lines...) Expand all
170 scoped_ptr<RendererNetPredictor> net_predictor_; 168 scoped_ptr<RendererNetPredictor> net_predictor_;
171 scoped_ptr<SpellCheck> spellcheck_; 169 scoped_ptr<SpellCheck> spellcheck_;
172 scoped_ptr<VisitedLinkSlave> visited_link_slave_; 170 scoped_ptr<VisitedLinkSlave> visited_link_slave_;
173 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; 171 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
174 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; 172 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
175 }; 173 };
176 174
177 } // namespace chrome 175 } // namespace chrome
178 176
179 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 177 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698