| Index: content/browser/plugin_service_impl.h
|
| diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
|
| index 8cb176aad24ca693b4431314bd5f40e156d421e5..a0353e5a51d50fed4a3fcc83977070e8f9470131 100644
|
| --- a/content/browser/plugin_service_impl.h
|
| +++ b/content/browser/plugin_service_impl.h
|
| @@ -69,14 +69,14 @@ class CONTENT_EXPORT PluginServiceImpl
|
| static PluginServiceImpl* GetInstance();
|
|
|
| // PluginService implementation:
|
| - virtual void Init() OVERRIDE;
|
| - virtual void StartWatchingPlugins() OVERRIDE;
|
| + virtual void Init() override;
|
| + virtual void StartWatchingPlugins() override;
|
| virtual bool GetPluginInfoArray(
|
| const GURL& url,
|
| const std::string& mime_type,
|
| bool allow_wildcard,
|
| std::vector<WebPluginInfo>* info,
|
| - std::vector<std::string>* actual_mime_types) OVERRIDE;
|
| + std::vector<std::string>* actual_mime_types) override;
|
| virtual bool GetPluginInfo(int render_process_id,
|
| int render_frame_id,
|
| ResourceContext* context,
|
| @@ -86,41 +86,41 @@ class CONTENT_EXPORT PluginServiceImpl
|
| bool allow_wildcard,
|
| bool* is_stale,
|
| WebPluginInfo* info,
|
| - std::string* actual_mime_type) OVERRIDE;
|
| + std::string* actual_mime_type) override;
|
| virtual bool GetPluginInfoByPath(const base::FilePath& plugin_path,
|
| - WebPluginInfo* info) OVERRIDE;
|
| + WebPluginInfo* info) override;
|
| virtual base::string16 GetPluginDisplayNameByPath(
|
| - const base::FilePath& path) OVERRIDE;
|
| - virtual void GetPlugins(const GetPluginsCallback& callback) OVERRIDE;
|
| + const base::FilePath& path) override;
|
| + virtual void GetPlugins(const GetPluginsCallback& callback) override;
|
| virtual PepperPluginInfo* GetRegisteredPpapiPluginInfo(
|
| - const base::FilePath& plugin_path) OVERRIDE;
|
| - virtual void SetFilter(PluginServiceFilter* filter) OVERRIDE;
|
| - virtual PluginServiceFilter* GetFilter() OVERRIDE;
|
| - virtual void ForcePluginShutdown(const base::FilePath& plugin_path) OVERRIDE;
|
| - virtual bool IsPluginUnstable(const base::FilePath& plugin_path) OVERRIDE;
|
| - virtual void RefreshPlugins() OVERRIDE;
|
| - virtual void AddExtraPluginPath(const base::FilePath& path) OVERRIDE;
|
| - virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE;
|
| - virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE;
|
| + const base::FilePath& plugin_path) override;
|
| + virtual void SetFilter(PluginServiceFilter* filter) override;
|
| + virtual PluginServiceFilter* GetFilter() override;
|
| + virtual void ForcePluginShutdown(const base::FilePath& plugin_path) override;
|
| + virtual bool IsPluginUnstable(const base::FilePath& plugin_path) override;
|
| + virtual void RefreshPlugins() override;
|
| + virtual void AddExtraPluginPath(const base::FilePath& path) override;
|
| + virtual void RemoveExtraPluginPath(const base::FilePath& path) override;
|
| + virtual void AddExtraPluginDir(const base::FilePath& path) override;
|
| virtual void RegisterInternalPlugin(
|
| - const WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
|
| - virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE;
|
| + const WebPluginInfo& info, bool add_at_beginning) override;
|
| + virtual void UnregisterInternalPlugin(const base::FilePath& path) override;
|
| virtual void GetInternalPlugins(
|
| - std::vector<WebPluginInfo>* plugins) OVERRIDE;
|
| - virtual bool NPAPIPluginsSupported() OVERRIDE;
|
| - virtual void DisablePluginsDiscoveryForTesting() OVERRIDE;
|
| + std::vector<WebPluginInfo>* plugins) override;
|
| + virtual bool NPAPIPluginsSupported() override;
|
| + virtual void DisablePluginsDiscoveryForTesting() override;
|
| #if defined(OS_MACOSX)
|
| - virtual void AppActivated() OVERRIDE;
|
| + virtual void AppActivated() override;
|
| #elif defined(OS_WIN)
|
| virtual bool GetPluginInfoFromWindow(HWND window,
|
| base::string16* plugin_name,
|
| - base::string16* plugin_version) OVERRIDE;
|
| + base::string16* plugin_version) override;
|
|
|
| // Returns true iff the given HWND is a plugin.
|
| bool IsPluginWindow(HWND window);
|
| #endif
|
| virtual bool PpapiDevChannelSupported(BrowserContext* browser_context,
|
| - const GURL& document_url) OVERRIDE;
|
| + const GURL& document_url) override;
|
|
|
| // Returns the plugin process host corresponding to the plugin process that
|
| // has been started by this service. This will start a process to host the
|
|
|