projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
components
/
plugins
/
renderer
/
plugin_placeholder.h
diff --git
a/src/components/plugins/renderer/plugin_placeholder.h
b/src/components/plugins/renderer/plugin_placeholder.h
index
3427d40
..
a5f2564
100644
(file)
--- a/
src/components/plugins/renderer/plugin_placeholder.h
+++ b/
src/components/plugins/renderer/plugin_placeholder.h
@@
-43,7
+43,7
@@
class PluginPlaceholder : public content::RenderFrameObserver,
const std::string& html_data,
GURL placeholderDataUrl);
const std::string& html_data,
GURL placeholderDataUrl);
-
virtual ~PluginPlaceholder()
;
+
~PluginPlaceholder() override
;
void OnLoadBlockedPlugins(const std::string& identifier);
void OnSetIsPrerendering(bool is_prerendering);
void OnLoadBlockedPlugins(const std::string& identifier);
void OnSetIsPrerendering(bool is_prerendering);
@@
-67,16
+67,16
@@
class PluginPlaceholder : public content::RenderFrameObserver,
void LoadPlugin();
// gin::Wrappable method:
void LoadPlugin();
// gin::Wrappable method:
-
virtual
gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
- v8::Isolate* isolate)
OVERRIDE
;
+ gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
+ v8::Isolate* isolate)
override
;
private:
// WebViewPlugin::Delegate methods:
private:
// WebViewPlugin::Delegate methods:
- v
irtual void ShowContextMenu(const blink::WebMouseEvent&) OVERRIDE
;
- v
irtual void PluginDestroyed() OVERRIDE
;
+ v
oid ShowContextMenu(const blink::WebMouseEvent&) override
;
+ v
oid PluginDestroyed() override
;
// RenderFrameObserver methods:
// RenderFrameObserver methods:
- v
irtual void OnDestruct() OVERRIDE
;
+ v
oid OnDestruct() override
;
// Javascript callbacks:
// Javascript callbacks: