Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / renderer_context_menu / spelling_menu_observer.cc

diff --git a/src/chrome/browser/renderer_context_menu/spelling_menu_observer.cc b/src/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
index c95aee9..bbce83d 100644 (file)
--- a/src/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
+++ b/src/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
@@ -25,7 +25,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
 #include "content/public/common/context_menu_params.h"
 #include "extensions/browser/view_type_utils.h"
 #include "grit/generated_resources.h"
@@ -165,16 +164,8 @@ void SpellingMenuObserver::InitMenu(const content::ContextMenuParams& params) {
   proxy_->AddMenuItem(IDC_SPELLCHECK_ADD_TO_DICTIONARY,
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_ADD_TO_DICTIONARY));
 
-#if defined(TOOLKIT_GTK)
-  extensions::ViewType view_type =
-      extensions::GetViewType(proxy_->GetWebContents());
-  if (view_type != extensions::VIEW_TYPE_PANEL) {
-#endif
-    proxy_->AddCheckItem(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE,
-        l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE));
-#if defined(TOOLKIT_GTK)
-  }
-#endif
+  proxy_->AddCheckItem(IDC_CONTENT_CONTEXT_SPELLING_TOGGLE,
+      l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE));
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableSpellingAutoCorrect)) {
@@ -251,7 +242,7 @@ void SpellingMenuObserver::ExecuteCommand(int command_id) {
   if (command_id >= IDC_SPELLCHECK_SUGGESTION_0 &&
       command_id <= IDC_SPELLCHECK_SUGGESTION_LAST) {
     int suggestion_index = command_id - IDC_SPELLCHECK_SUGGESTION_0;
-    proxy_->GetRenderViewHost()->ReplaceMisspelling(
+    proxy_->GetWebContents()->ReplaceMisspelling(
         suggestions_[suggestion_index]);
     // GetSpellCheckHost() can return null when the suggested word is provided
     // by Web SpellCheck API.
@@ -273,7 +264,7 @@ void SpellingMenuObserver::ExecuteCommand(int command_id) {
   // the misspelled word with the suggestion and add it to our custom-word
   // dictionary so this word is not marked as misspelled any longer.
   if (command_id == IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION) {
-    proxy_->GetRenderViewHost()->ReplaceMisspelling(result_);
+    proxy_->GetWebContents()->ReplaceMisspelling(result_);
     misspelled_word_ = result_;
   }
 
@@ -308,7 +299,7 @@ void SpellingMenuObserver::ExecuteCommand(int command_id) {
       gfx::Rect rect = rvh->GetView()->GetViewBounds();
       chrome::ShowConfirmBubble(
 #if defined(TOOLKIT_VIEWS)
-          proxy_->GetWebContents()->GetView()->GetTopLevelNativeWindow(),
+          proxy_->GetWebContents()->GetTopLevelNativeWindow(),
 #else
           rvh->GetView()->GetNativeView(),
 #endif