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

Side by Side Diff: content/browser/plugin_service.h

Issue 8587009: Add OVERRIDE to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/plugin_process_host.h ('k') | content/browser/ppapi_plugin_process_host.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // This class responds to requests from renderers for the list of plugins, and 5 // This class responds to requests from renderers for the list of plugins, and
6 // also a proxy object for plugin instances. 6 // also a proxy object for plugin instances.
7 7
8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_ 8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_ 9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_
10 #pragma once 10 #pragma once
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 private: 196 private:
197 friend struct DefaultSingletonTraits<PluginService>; 197 friend struct DefaultSingletonTraits<PluginService>;
198 198
199 // Creates the PluginService object, but doesn't actually build the plugin 199 // Creates the PluginService object, but doesn't actually build the plugin
200 // list yet. It's generated lazily. 200 // list yet. It's generated lazily.
201 PluginService(); 201 PluginService();
202 virtual ~PluginService(); 202 virtual ~PluginService();
203 203
204 // base::WaitableEventWatcher::Delegate implementation. 204 // base::WaitableEventWatcher::Delegate implementation.
205 virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event); 205 virtual void OnWaitableEventSignaled(
206 base::WaitableEvent* waitable_event) OVERRIDE;
206 207
207 // content::NotificationObserver implementation 208 // content::NotificationObserver implementation
208 virtual void Observe(int type, const content::NotificationSource& source, 209 virtual void Observe(int type,
209 const content::NotificationDetails& details); 210 const content::NotificationSource& source,
211 const content::NotificationDetails& details) OVERRIDE;
210 212
211 void RegisterPepperPlugins(); 213 void RegisterPepperPlugins();
212 214
213 content::PepperPluginInfo* GetRegisteredPpapiPluginInfo( 215 content::PepperPluginInfo* GetRegisteredPpapiPluginInfo(
214 const FilePath& plugin_path); 216 const FilePath& plugin_path);
215 217
216 // Function that is run on the FILE thread to load the plugins synchronously. 218 // Function that is run on the FILE thread to load the plugins synchronously.
217 void GetPluginsInternal(base::MessageLoopProxy* target_loop, 219 void GetPluginsInternal(base::MessageLoopProxy* target_loop,
218 const GetPluginsCallback& callback); 220 const GetPluginsCallback& callback);
219 221
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 #if defined(OS_POSIX) 284 #if defined(OS_POSIX)
283 scoped_refptr<PluginLoaderPosix> plugin_loader_; 285 scoped_refptr<PluginLoaderPosix> plugin_loader_;
284 #endif 286 #endif
285 287
286 DISALLOW_COPY_AND_ASSIGN(PluginService); 288 DISALLOW_COPY_AND_ASSIGN(PluginService);
287 }; 289 };
288 290
289 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService); 291 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
290 292
291 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_ 293 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_
OLDNEW
« no previous file with comments | « content/browser/plugin_process_host.h ('k') | content/browser/ppapi_plugin_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698