Set |contents_mime_type| early enough so that the encoding menu is enabled on...

chrome/browser/web_contents.cc

 // Copyright (c) 2006-2008 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/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "chrome/app/locales/locale_settings.h"
@@ skipping 666 matching lines @@
   // are showing an interstitial page.  If we are, we should wait until the
   // real page commits.
   //
   // TODO(brettw) the old code only checked for INTERSTIAL, this new code also
   // checks for LEAVING_INTERSTITIAL mode in the manager. Is this difference
   // important?
   if (!GetSiteInstance()->has_site() &&
       !render_manager_.showing_interstitial_page())
     GetSiteInstance()->SetSite(params.url);
 
+  // Need to update MIME type here because it's referred to in 
+  // UpdateNavigationCommands() called by RendererDidNavigate() to
+  // determine whether or not to enable the encoding menu. 
+  // TODO(jungshik): Add a test for the encoding menu to avoid 
+  // regressing it again. 
+  contents_mime_type_ = params.contents_mime_type;
+
   NavigationController::LoadCommittedDetails details;
   if (!controller()->RendererDidNavigate(
       params,
       render_manager_.IsRenderViewInterstitial(rvh),
       &details))
     return;  // No navigation happened.
 
   // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen
   // for the appropriate notification (best) or you can add it to
   // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if
@@ skipping 732 matching lines @@
       GetPasswordManager()->DidNavigate();
   }
 
   // The keyword generator uses the navigation entries, so must be called after
   // the commit.
   GenerateKeywordIfNecessary(params);
 
   // Allow the new page to set the title again.
   received_page_title_ = false;
 
-  // Update contents MIME type of the main webframe.
-  contents_mime_type_ = params.contents_mime_type;
-
   // Get the favicon, either from history or request it from the net.
   fav_icon_helper_.FetchFavIcon(details.entry->url());
 
   // Close constrained popups if necessary.
   MaybeCloseChildWindows(details.previous_url, details.entry->url());
 
   // We hide the FindInPage window when the user navigates away, except on
   // reload.
   if (PageTransition::StripQualifier(params.transition) !=
       PageTransition::RELOAD)
@@ skipping 289 matching lines @@
     // The favicon url isn't valid. This means there really isn't a favicon,
     // or the favicon url wasn't obtained before the load started. This assumes
     // the later.
     // TODO(sky): Need a way to set the favicon that doesn't involve generating
     // its url.
     new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer));
   }
   new_url->set_safe_for_autoreplace(true);
   url_model->Add(new_url);
 }