Fix the Spelling UI.

chrome/browser/tab_contents/spelling_menu_observer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/spelling_menu_observer.h"
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/string_escape.h"
@@ skipping 37 matching lines @@
 }
 
 void SpellingMenuObserver::InitMenu(const ContextMenuParams& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Exit if we are not in an editable element because we add a menu item only
   // for editable elements.
   if (!params.is_editable)
     return;
 
+  // Append Dictionary spell check suggestions.
+  suggestions_ = params.dictionary_suggestions;
+  for (size_t i = 0; i < params.dictionary_suggestions.size() &&
+       IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
+       ++i) {
+    proxy_->AddMenuItem(IDC_SPELLCHECK_SUGGESTION_0 + static_cast<int>(i),
+                        params.dictionary_suggestions[i]);
+  }
+
   Profile* profile = proxy_->GetProfile();
   if (!profile || !profile->GetRequestContext())
     return;
 
   PrefService* pref = profile->GetPrefs();
   if (pref->GetBoolean(prefs::kEnableSpellCheck) &&
       pref->GetBoolean(prefs::kSpellCheckUseSpellingService)) {
     // Retrieve the misspelled word to be sent to the Spelling service.
     string16 text = params.misspelled_word;
     if (text.empty())
@@ skipping 15 matching lines @@
                         loading_message_);
 
     // Invoke a JSON-RPC call to the Spelling service in the background so we
     // can update the placeholder item when we receive its response. It also
     // starts the animation timer so we can show animation until we receive it.
     const PrefService* pref = profile->GetPrefs();
     std::string language =
         pref ? pref->GetString(prefs::kSpellCheckDictionary) : "en-US";
     Invoke(text, language, profile->GetRequestContext());
   }
-
-  // Append Dictionary spell check suggestions.
-  suggestions_ = params.dictionary_suggestions;
-  for (size_t i = 0; i < params.dictionary_suggestions.size() &&
-       IDC_SPELLCHECK_SUGGESTION_0 + i <= IDC_SPELLCHECK_SUGGESTION_LAST;
-       ++i) {
-    proxy_->AddMenuItem(IDC_SPELLCHECK_SUGGESTION_0 + static_cast<int>(i),
-                        params.dictionary_suggestions[i]);
-  }
 }
 
 bool SpellingMenuObserver::IsCommandIdSupported(int command_id) {
   if (command_id >= IDC_SPELLCHECK_SUGGESTION_0 &&
       command_id <= IDC_SPELLCHECK_SUGGESTION_4)
       return true;
 
   return command_id == IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION;
 }
 
@@ skipping 203 matching lines @@
   loading_frame_ = (loading_frame_ + 1) & 3;
   string16 loading_message = loading_message_;
   for (int i = 0; i < loading_frame_; ++i)
     loading_message.push_back('.');
 
   // Update the menu item with the text. We disable this item to prevent users
   // from selecting it.
   proxy_->UpdateMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, false, false,
                          loading_message);
 }