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

Side by Side Diff: chrome/renderer/plugins/chrome_plugin_placeholder.h

Issue 630603003: Replacing the OVERRIDE with override in chrome/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 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/renderer/pepper/pepper_uma_host.h ('k') | chrome/renderer/plugins/plugin_uma.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_ 5 #ifndef CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_
6 #define CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_ 6 #define CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_
7 7
8 #include "components/plugins/renderer/plugin_placeholder.h" 8 #include "components/plugins/renderer/plugin_placeholder.h"
9 9
10 struct ChromeViewHostMsg_GetPluginInfo_Status; 10 struct ChromeViewHostMsg_GetPluginInfo_Status;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 private: 44 private:
45 ChromePluginPlaceholder(content::RenderFrame* render_frame, 45 ChromePluginPlaceholder(content::RenderFrame* render_frame,
46 blink::WebLocalFrame* frame, 46 blink::WebLocalFrame* frame,
47 const blink::WebPluginParams& params, 47 const blink::WebPluginParams& params,
48 const std::string& html_data, 48 const std::string& html_data,
49 const base::string16& title); 49 const base::string16& title);
50 virtual ~ChromePluginPlaceholder(); 50 virtual ~ChromePluginPlaceholder();
51 51
52 // WebViewPlugin::Delegate (via PluginPlaceholder) method 52 // WebViewPlugin::Delegate (via PluginPlaceholder) method
53 virtual void BindWebFrame(blink::WebFrame* frame) OVERRIDE; 53 virtual void BindWebFrame(blink::WebFrame* frame) override;
54 54
55 // gin::Wrappable (via PluginPlaceholder) method 55 // gin::Wrappable (via PluginPlaceholder) method
56 virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder( 56 virtual gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
57 v8::Isolate* isolate) OVERRIDE; 57 v8::Isolate* isolate) override;
58 58
59 // content::RenderViewObserver (via PluginPlaceholder) override: 59 // content::RenderViewObserver (via PluginPlaceholder) override:
60 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 60 virtual bool OnMessageReceived(const IPC::Message& message) override;
61 61
62 // WebViewPlugin::Delegate (via PluginPlaceholder) methods: 62 // WebViewPlugin::Delegate (via PluginPlaceholder) methods:
63 virtual void ShowContextMenu(const blink::WebMouseEvent&) OVERRIDE; 63 virtual void ShowContextMenu(const blink::WebMouseEvent&) override;
64 64
65 // content::RenderProcessObserver methods: 65 // content::RenderProcessObserver methods:
66 virtual void PluginListChanged() OVERRIDE; 66 virtual void PluginListChanged() override;
67 67
68 // content::ContextMenuClient methods: 68 // content::ContextMenuClient methods:
69 virtual void OnMenuAction(int request_id, unsigned action) OVERRIDE; 69 virtual void OnMenuAction(int request_id, unsigned action) override;
70 virtual void OnMenuClosed(int request_id) OVERRIDE; 70 virtual void OnMenuClosed(int request_id) override;
71 71
72 // Javascript callback opens chrome://plugins in a new tab. 72 // Javascript callback opens chrome://plugins in a new tab.
73 void OpenAboutPluginsCallback(); 73 void OpenAboutPluginsCallback();
74 74
75 void OnLoadBlockedPlugins(const std::string& identifier); 75 void OnLoadBlockedPlugins(const std::string& identifier);
76 void OnSetIsPrerendering(bool is_prerendering); 76 void OnSetIsPrerendering(bool is_prerendering);
77 #if defined(ENABLE_PLUGIN_INSTALLATION) 77 #if defined(ENABLE_PLUGIN_INSTALLATION)
78 void OnDidNotFindMissingPlugin(); 78 void OnDidNotFindMissingPlugin();
79 void OnFoundMissingPlugin(const base::string16& plugin_name); 79 void OnFoundMissingPlugin(const base::string16& plugin_name);
80 void OnStartedDownloadingPlugin(); 80 void OnStartedDownloadingPlugin();
(...skipping 15 matching lines...) Expand all
96 #endif 96 #endif
97 97
98 bool has_host_; 98 bool has_host_;
99 int context_menu_request_id_; // Nonzero when request pending. 99 int context_menu_request_id_; // Nonzero when request pending.
100 base::string16 plugin_name_; 100 base::string16 plugin_name_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(ChromePluginPlaceholder); 102 DISALLOW_COPY_AND_ASSIGN(ChromePluginPlaceholder);
103 }; 103 };
104 104
105 #endif // CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_ 105 #endif // CHROME_RENDERER_PLUGINS_CHROME_PLUGIN_PLACEHOLDER_H_
OLDNEW
« no previous file with comments | « chrome/renderer/pepper/pepper_uma_host.h ('k') | chrome/renderer/plugins/plugin_uma.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698