download filename fix

webkit/glue/context_menu_client_impl.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 "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "ContextMenu.h"
@@ skipping 159 matching lines @@
   }
 
   // If it's not a link, an image or an image link, show a selection menu or a
   // more generic page menu.
   std::wstring selection_text_string;
   std::wstring misspelled_word_string;
   GURL frame_url;
   GURL page_url;
   std::string security_info;
 
-  std::wstring frame_encoding;
+  std::string frame_charset = WideToASCII(
+      webkit_glue::StringToStdWString(selected_frame->loader()->encoding()));
   // Send the frame and page URLs in any case.
   ContextNode frame_node = ContextNode(ContextNode::NONE);
   ContextNode page_node =
       GetTypeAndURLFromFrame(webview_->main_frame()->frame(),
                              &page_url,
                              ContextNode(ContextNode::PAGE));
   if (selected_frame != webview_->main_frame()->frame()) {
     frame_node = GetTypeAndURLFromFrame(selected_frame,
                                         &frame_url,
                                         ContextNode(ContextNode::FRAME));
-    frame_encoding = webkit_glue::StringToStdWString(
-        selected_frame->loader()->encoding());
   }
 
   if (r.isSelected()) {
     node.type |= ContextNode::SELECTION;
     selection_text_string = CollapseWhitespace(
       webkit_glue::StringToStdWString(selected_frame->selectedText()),
       false);
   }
 
   if (r.isContentEditable()) {
@@ skipping 43 matching lines @@
                        node,
                        menu_point.x(),
                        menu_point.y(),
                        webkit_glue::KURLToGURL(link_url),
                        webkit_glue::KURLToGURL(image_url),
                        page_url,
                        frame_url,
                        selection_text_string,
                        misspelled_word_string,
                        edit_flags,
-                       security_info);
+                       security_info,
+                       frame_charset);
   }
   return NULL;
 }
 
 void ContextMenuClientImpl::contextMenuItemSelected(
     WebCore::ContextMenuItem*, const WebCore::ContextMenu*) {
 }
 
 void ContextMenuClientImpl::downloadURL(const WebCore::KURL&) {
 }
@@ skipping 15 matching lines @@
 
 bool ContextMenuClientImpl::shouldIncludeInspectElementItem() {
     return false;  // TODO(jackson): Eventually include the inspector context menu item
 }
 
 #if defined(OS_MACOSX)
 void ContextMenuClientImpl::searchWithSpotlight() {
   // TODO(pinkerton): write this
 }
 #endif