Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / plugins / plugin_observer.cc

diff --git a/src/chrome/browser/plugins/plugin_observer.cc b/src/chrome/browser/plugins/plugin_observer.cc
index 56c91b0..3d2eb2e 100644 (file)
--- a/src/chrome/browser/plugins/plugin_observer.cc
+++ b/src/chrome/browser/plugins/plugin_observer.cc
@@ -65,7 +65,7 @@ class ConfirmInstallDialogDelegate : public TabModalConfirmDialogDelegate,
 
   // TabModalConfirmDialogDelegate methods:
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetMessage() OVERRIDE;
+  virtual base::string16 GetDialogMessage() OVERRIDE;
   virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
   virtual void OnAccepted() OVERRIDE;
   virtual void OnCanceled() OVERRIDE;
@@ -94,7 +94,7 @@ base::string16 ConfirmInstallDialogDelegate::GetTitle() {
       IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_TITLE, plugin_metadata_->name());
 }
 
-base::string16 ConfirmInstallDialogDelegate::GetMessage() {
+base::string16 ConfirmInstallDialogDelegate::GetDialogMessage() {
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_MSG,
                                     plugin_metadata_->name());
 }
@@ -185,7 +185,7 @@ PluginObserver::~PluginObserver() {
 
 void PluginObserver::RenderFrameCreated(
     content::RenderFrameHost* render_frame_host) {
-#if defined(USE_AURA) && defined(OS_WIN)
+#if defined(OS_WIN)
   // If the window belongs to the Ash desktop, before we navigate we need
   // to tell the renderview that NPAPI plugins are not supported so it does
   // not try to instantiate them. The final decision is actually done in